diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-06-24 + * libplugin.pro: Use correct library path. + * VirtualLeaf.pro: Ditto. + * VirtualLeaf.cpp (DrawCell): Iterate over NChem to construct info_string. 2010-06-23 diff --git a/src/VirtualLeaf.pro b/src/VirtualLeaf.pro --- a/src/VirtualLeaf.pro +++ b/src/VirtualLeaf.pro @@ -37,6 +37,7 @@ DEFINES += REACTIONS_HEADER_STRING=\"$${ DEFINES += FLEMING BINDIR = ../bin +LIBDIR = ../lib DESTDIR = $$BINDIR TARGET = VirtualLeaf TEMPLATE = app @@ -51,12 +52,12 @@ QT += qt3support win32 { CONFIG -= console - LIBXML2DIR = C: - LIBICONVDIR = C: - LIBZDIR = C: + LIBXML2DIR = $${LIBDIR}\libxml2 + LIBICONVDIR = $${LIBDIR}\libiconv + LIBZDIR = $${LIBDIR}\libz GRAPHICS = qt RC_FILE = VirtualLeaf.rc -# QMAKE_CXXFLAGS += -DLIBXML_STATIC + QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include LIBS += -L$${LIBXML2DIR}\lib -lxml2 -L$${LIBICONVDIR}\lib -L$${LIBZDIR}\lib -lz -lm -lwsock32 -liconv } diff --git a/src/build_models/ChangeLog b/src/build_models/ChangeLog --- a/src/build_models/ChangeLog +++ b/src/build_models/ChangeLog @@ -1,3 +1,10 @@ +2010-06-24 + + * plugin_auxingrowth.pro: Use correct library path. + * plugin_meinhardt.pro: Ditto. + * plugin_test.pro: Ditto. + + 2010-06-23 * auxingrowthplugin.cpp: Removed NULL assignments to unused variables. 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 @@ -44,9 +44,9 @@ unix { } win32 { - LIBXML2DIR = $${LIBDIR}\lib\libxml2 - LIBICONVDIR = $${LIBDIR}\lib\libiconv - LIBZDIR = $${LIBDIR}\lib\libz + LIBXML2DIR = $${LIBDIR}\libxml2 + LIBICONVDIR = $${LIBDIR}\libiconv + LIBZDIR = $${LIBDIR}\libz LIBS += -L$${LIBDIR} -Llib -lvleaf QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\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 @@ -44,9 +44,9 @@ unix { } win32 { - LIBXML2DIR = $${LIBDIR}\lib\libxml2 - LIBICONVDIR = $${LIBDIR}\lib\libiconv - LIBZDIR = $${LIBDIR}\lib\libz + LIBXML2DIR = $${LIBDIR}\libxml2 + LIBICONVDIR = $${LIBDIR}\libiconv + LIBZDIR = $${LIBDIR}\libz LIBS += -L$${LIBDIR} -Llib -lvleaf QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\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 @@ -44,9 +44,9 @@ unix { } win32 { - LIBXML2DIR = $${LIBDIR}\lib\libxml2 - LIBICONVDIR = $${LIBDIR}\lib\libiconv - LIBZDIR = $${LIBDIR}\lib\libz + LIBXML2DIR = $${LIBDIR}\libxml2 + LIBICONVDIR = $${LIBDIR}\libiconv + LIBZDIR = $${LIBDIR}\libz LIBS += -L$${LIBDIR} -Llib -lvleaf QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include diff --git a/src/libplugin.pro b/src/libplugin.pro --- a/src/libplugin.pro +++ b/src/libplugin.pro @@ -30,7 +30,8 @@ QMAKE_CXXFLAGS_DEBUG += -DQDEBUG QMAKE_CXXFLAGS_DEBUG -= -finstrument-functions DEFINES = QTGRAPHICS # VLEAFPLUGIN -DESTDIR = ../lib +DESTDIR = ../lib +LIBDIR = ../lib PARTMPL = VirtualLeafpar.tmpl QT += qt3support TARGET = vleaf @@ -69,10 +70,10 @@ unix { } win32 { - LIBXML2DIR = C: - LIBICONVDIR = C: - LIBZDIR = C: -# QMAKE_CXXFLAGS += -DLIBXML_STATIC + LIBXML2DIR = $${LIBDIR}\libxml2 + LIBICONVDIR = $${LIBDIR}\libiconv + LIBZDIR = $${LIBDIR}\libz + QMAKE_CXXFLAGS += -DLIBXML_STATIC QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include }