diff --git a/src/VirtualLeaf.pro b/src/VirtualLeaf.pro --- a/src/VirtualLeaf.pro +++ b/src/VirtualLeaf.pro @@ -37,18 +37,19 @@ MAINSRC = $${TARGET}.cpp QT -= network sql xml QT += qt3support -LIBXML2DIR = C:\libxml2 - !win32 { GRAPHICS = qt #qwt } win32 { CONFIG += console + LIBXML2DIR = C:\libxml2 + LIBICONVDIR = C:\libiconv system(DEL parameter.cpp parameter.h) GRAPHICS = qt RC_FILE = VirtualLeaf.rc - QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include + QMAKE_CXXFLAGS += -DLIBXML_STATIC + QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include QMAKE_CXXFLAGS_DEBUG += -DQDEBUG -ggdb3 -O0 QMAKE_POST_LINK = "\ C:\Bin\cp release\VirtualLeaf.exe \ @@ -64,7 +65,7 @@ win32 { C:\bin\zlib1.dll \ C:\MinGW\bin\mingwm10.dll \ $${DESTDIR}" - LIBS += -lz -lm -lwsock32 -L$${LIBXML2DIR}\lib -lxml2 + LIBS += -L$${LIBXML2DIR}\lib -lxml2 -L$${LIBICONVDIR}\lib -lz -lm -lwsock32 -liconv } # Application icons diff --git a/src/VirtualLeaf_d.pro b/src/VirtualLeaf_d.pro --- a/src/VirtualLeaf_d.pro +++ b/src/VirtualLeaf_d.pro @@ -37,18 +37,19 @@ MAINSRC = $${TARGET}.cpp QT -= network sql xml QT += qt3support -LIBXML2DIR = C:\libxml2 - !win32 { GRAPHICS = qt #qwt } win32 { CONFIG += console + LIBXML2DIR = C:\libxml2 + LIBICONVDIR = C:\libiconv system(DEL parameter.cpp parameter.h) GRAPHICS = qt RC_FILE = VirtualLeaf.rc - QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include + QMAKE_CXXFLAGS += -DLIBXML_STATIC + QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include QMAKE_CXXFLAGS_DEBUG += -DQDEBUG -ggdb3 -O0 QMAKE_POST_LINK = "\ C:\Bin\cp release\VirtualLeaf.exe \ @@ -64,7 +65,7 @@ win32 { C:\bin\zlib1.dll \ C:\MinGW\bin\mingwm10.dll \ $${DESTDIR}" - LIBS += -lz -lm -lwsock32 -L$${LIBXML2DIR}\lib -lxml2 + LIBS += -L$${LIBXML2DIR}\lib -lxml2 -L$${LIBICONVDIR}\lib -lz -lm -lwsock32 -liconv } # Application icons diff --git a/src/build_models/plugin_auxingrowth.pro b/src/build_models/plugin_auxingrowth.pro --- a/src/build_models/plugin_auxingrowth.pro +++ b/src/build_models/plugin_auxingrowth.pro @@ -30,8 +30,6 @@ QT += qt3support SOURCES = $${TARGET}plugin.cpp TEMPLATE = lib -LIBXML2DIR = C:\libxml2 - unix { LIBS += -Llib -lvleaf QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2 @@ -39,6 +37,7 @@ unix { } win32 { + LIBXML2DIR = C:\libxml2 LIBS += -Llib -lvleaf QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include } diff --git a/src/build_models/plugin_leaf.pro b/src/build_models/plugin_leaf.pro --- a/src/build_models/plugin_leaf.pro +++ b/src/build_models/plugin_leaf.pro @@ -30,8 +30,6 @@ QT += qt3support SOURCES = $${TARGET}plugin.cpp TEMPLATE = lib -LIBXML2DIR = C:\libxml2 - unix { LIBS += -Llib -lvleaf QMAKE_CXXFLAGS += -fexceptions -fPIC -I/usr/include/libxml2 @@ -39,6 +37,7 @@ unix { } win32 { + LIBXML2DIR = C:\libxml2 LIBS += -Llib -lvleaf QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include } diff --git a/src/build_models/plugin_meinhardt.pro b/src/build_models/plugin_meinhardt.pro --- a/src/build_models/plugin_meinhardt.pro +++ b/src/build_models/plugin_meinhardt.pro @@ -30,8 +30,6 @@ QT += qt3support SOURCES = $${TARGET}plugin.cpp TEMPLATE = lib -LIBXML2DIR = C:\libxml2 - unix { LIBS += -Llib -lvleaf QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2 @@ -39,6 +37,7 @@ unix { } win32 { + LIBXML2DIR = C:\libxml2 LIBS += -Llib -lvleaf QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include } diff --git a/src/build_models/plugin_test.pro b/src/build_models/plugin_test.pro --- a/src/build_models/plugin_test.pro +++ b/src/build_models/plugin_test.pro @@ -31,8 +31,6 @@ QT += qt3support SOURCES = $${TARGET}plugin.cpp TEMPLATE = lib -LIBXML2DIR = C:\libxml2 - unix { LIBS += -Llib -lvleaf QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2 @@ -40,7 +38,9 @@ unix { } win32 { + LIBXML2DIR = C:\libxml2 LIBS += -Llib -lvleaf + QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include } diff --git a/src/libplugin.pro b/src/libplugin.pro --- a/src/libplugin.pro +++ b/src/libplugin.pro @@ -28,8 +28,6 @@ QT += qt3support TARGET = vleaf TEMPLATE = lib -LIBXML2DIR = C:\libxml2 - HEADERS = \ cellbase.h \ matrix.h \ @@ -65,6 +63,8 @@ unix { win32 { system(DEL parameter.cpp parameter.h) + LIBXML2DIR = C:\libxml2 + QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include }