EI/VirtualLeaf Changeset - ae58c51ca8dd · Centrum Wiskunde & Informatica (CWI)

Changeset - ae58c51ca8dd

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Michael Guravage - 15 years ago 2010-06-24 16:10:23
michael.guravage@cwi.nl

Use Correct library path in various project files.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
changed src/ChangeLog
changed src/VirtualLeaf.pro
changed src/build_models/ChangeLog
changed src/build_models/plugin_auxingrowth.pro
changed src/build_models/plugin_meinhardt.pro
changed src/build_models/plugin_test.pro
changed src/libplugin.pro

7 files changed with 30 insertions and 18 deletions:

src/ChangeLog

src/VirtualLeaf.pro

src/build_models/ChangeLog

src/build_models/plugin_auxingrowth.pro

src/build_models/plugin_meinhardt.pro

src/build_models/plugin_test.pro

src/libplugin.pro

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -06-24    <guravage@caterpie.sen.cwi.nl>
 	* libplugin.pro: Use correct library path.
 	* VirtualLeaf.pro: Ditto.
 	* VirtualLeaf.cpp (DrawCell): Iterate over NChem to construct info_string.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* simitembase.cpp: Removed NULL assignments to unused variables.
 	* VirtualLeaf.cpp: Ditto.
 	* apoplastitem.cpp: Ditto.
 	* canvas.cpp: Ditto.
 	* cell.cpp: Ditto.
 	* cellbase.h: Ditto.
 	* forwardeuler.cpp: Ditto.
 	* mainbase.h: Ditto.

src/VirtualLeaf.pro

➞

Show inline comments

@@ @@ -28,44 +28,45 @@ QMAKE_CXXFLAGS += -Wall @@
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 #REACTIONS = reactions_auxin_growth.h
 #REACTIONS = reactions_meinhardt.h
 #REACTIONS = reactions_pce_growth.h
 DEFINES += QTGRAPHICS
 DEFINES += REACTIONS_HEADER=$${REACTIONS}
 DEFINES += REACTIONS_HEADER_STRING=\"$${REACTIONS}\"
 DEFINES += FLEMING
 BINDIR = ../bin
 LIBDIR = ../lib
 DESTDIR = $$BINDIR
 TARGET = VirtualLeaf
 TEMPLATE = app
 PARTMPL = $${TARGET}par.tmpl
 MAINSRC = $${TARGET}.cpp
 QT -= network sql xml
 QT += qt3support
 !win32 {
  GRAPHICS = qt #qwt
+}
 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
+}
 macx:release {
  LIBS+= -dead_strip
+}
 unix {
  CC = /usr/bin/gcc
  QWTDIR = /ufs/guravage/opt/qwt-5.2.1-svn

src/build_models/ChangeLog

➞

Show inline comments

 -06-24    <guravage@caterpie.sen.cwi.nl>
 	* plugin_auxingrowth.pro: Use correct library path.
 	* plugin_meinhardt.pro: Ditto.
 	* plugin_test.pro: Ditto.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* auxingrowthplugin.cpp: Removed NULL assignments to unused variables.
 	* meinhardtplugin.cpp: Ditto.
 	* testplugin.cpp: Ditto.
 -06-22    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (clean): Add windows equivalent of UNIX touch.

src/build_models/plugin_auxingrowth.pro

➞

Show inline comments

@@ @@ -35,21 +35,21 @@ QMAKE_CXXFLAGS_DEBUG += -DQDEBUG @@
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib
 unix {
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 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
+}
 # finis

src/build_models/plugin_meinhardt.pro

➞

Show inline comments

@@ @@ -35,22 +35,22 @@ QMAKE_CXXFLAGS_DEBUG += -DQDEBUG @@
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib
 unix {
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 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
+}
 # finis

src/build_models/plugin_test.pro

➞

Show inline comments

@@ @@ -35,22 +35,22 @@ QMAKE_CXXFLAGS_DEBUG += -DQDEBUG @@
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib
 unix {
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 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
+}
 # finis

src/libplugin.pro

➞

Show inline comments

@@ @@ -21,25 +21,26 @@ @@
 CONFIG += release
 CONFIG -= debug
 CONFIG += staticlib
 QMAKE_CXXFLAGS += -fexceptions
 win32:QMAKE_CXXFLAGS -= O2
 QMAKE_CXXFLAGS_DEBUG += -g3
 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
 TEMPLATE = lib
 HEADERS = \
  cellbase.h \
  matrix.h \
  output.h \
  parameter.h \
  parse.h \
  random.h \
@@ @@ -60,20 +61,20 @@ SOURCES = \ @@
  UniqueMessage.cpp \
  vector.cpp \
  wallbase.cpp \
  warning.cpp
 unix {
  QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
  LIBS += -lxml2 -lz -lm
+}
 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
+}
+#

0 comments (0 inline, 0 general)