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

Changeset - 7e16256a76f6

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Michael Guravage - 15 years ago 2010-04-29 21:43:19
michael.guravage@cwi.nl

Look at the libraries and paths in win32:LIB in VirtualLeaf.pro.
The libraries libxml2 and libiconv are individually installed in C:,
and libiconv.dll.a copied, i.e. renamed, to libiconv.a.
At least everything compiles and links.

7 files changed with 17 insertions and 18 deletions:

src/VirtualLeaf.pro

src/VirtualLeaf_d.pro

src/build_models/plugin_auxingrowth.pro

src/build_models/plugin_leaf.pro

src/build_models/plugin_meinhardt.pro

src/build_models/plugin_test.pro

src/libplugin.pro

0 comments (0 inline, 0 general)

src/VirtualLeaf.pro

➞

Show inline comments

@@ @@ -28,52 +28,53 @@ DEFINES += REACTIONS_HEADER_STRING=\"$${ @@
 DEFINES += FLEMING
 CONFIG += qt release
 PERLDIR = ./perl
 BINDIR = ../bin
 DESTDIR = $$BINDIR
 TARGET = VirtualLeaf
 PARTMPL = $${TARGET}par.tmpl
 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 \
   C:\Qt\4.5.3\bin\Qt3Support4.dll \
   C:\Qt\4.5.3\bin\QtGui4.dll \
   C:\Qt\4.5.3\bin\QtSql4.dll \
   C:\Qt\4.5.3\bin\QtXml4.dll \
   C:\Qt\4.5.3\bin\QtCore4.dll \
   C:\Qt\4.5.3\bin\QtNetwork4.dll \
   C:\Qt\4.5.3\bin\QtSvg4.dll \
   C:\bin\iconv.dll \
   C:\bin\libxml2.dll \
   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
 macx {
  ICON = leaficon.icns
  # make sure that the executable can find the libqwt share library
  QMAKE_POST_LINK = "mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
   cp /usr/local/qwt/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/.; \
   #install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET}; \
   install_name_tool -id @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/libqwt.dylib; \
   install_name_tool -change libqwt.5.dylib @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET};\
   cp leaficon.icns $${DESTDIR}/$${TARGET}.app; "

src/VirtualLeaf_d.pro

➞

Show inline comments

@@ @@ -28,52 +28,53 @@ DEFINES += REACTIONS_HEADER_STRING=\"$${ @@
 DEFINES += FLEMING
 CONFIG += qt debug
 PERLDIR = ./perl
 BINDIR = ../bin
 DESTDIR = $$BINDIR
 TARGET = VirtualLeaf
 PARTMPL = $${TARGET}par.tmpl
 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 \
   C:\Qt\4.5.3\bin\Qt3Support4.dll \
   C:\Qt\4.5.3\bin\QtGui4.dll \
   C:\Qt\4.5.3\bin\QtSql4.dll \
   C:\Qt\4.5.3\bin\QtXml4.dll \
   C:\Qt\4.5.3\bin\QtCore4.dll \
   C:\Qt\4.5.3\bin\QtNetwork4.dll \
   C:\Qt\4.5.3\bin\QtSvg4.dll \
   C:\bin\iconv.dll \
   C:\bin\libxml2.dll \
   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
 macx {
  ICON = leaficon.icns
  # make sure that the executable can find the libqwt share library
  QMAKE_POST_LINK = "mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
   cp /usr/local/qwt/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/.; \
   #install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET}; \
   install_name_tool -id @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/libqwt.dylib; \
   install_name_tool -change libqwt.5.dylib @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET};\
   cp leaficon.icns $${DESTDIR}/$${TARGET}.app; "

src/build_models/plugin_auxingrowth.pro

➞

Show inline comments

@@ @@ -21,26 +21,25 @@ @@
 BINDIR = ../../bin
 CONFIG += plugin release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = auxingrowth
 HEADERS = ../simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -I..
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib
 LIBXML2DIR = C:\libxml2
 unix {
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include
+}
 # finis

src/build_models/plugin_leaf.pro

➞

Show inline comments

@@ @@ -21,26 +21,25 @@ @@
 BINDIR = ../../bin
 CONFIG += plugin release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = leaf
 HEADERS = ../simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -I..
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib
 LIBXML2DIR = C:\libxml2
 unix {
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include
+}
 # finis

src/build_models/plugin_meinhardt.pro

➞

Show inline comments

@@ @@ -21,27 +21,26 @@ @@
 BINDIR = ../../bin
 CONFIG += plugin release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = meinhardt
 HEADERS = simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -I..
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib
 LIBXML2DIR = C:\libxml2
 unix {
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include
+}
 # finis

src/build_models/plugin_test.pro

➞

Show inline comments

@@ @@ -22,26 +22,26 @@ @@
 BINDIR = ../../bin
 CONFIG += plugin release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = test
 HEADERS = ../simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -I..
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib
 LIBXML2DIR = C:\libxml2
 unix {
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include
+}
 # finis

src/libplugin.pro

➞

Show inline comments

@@ @@ -19,26 +19,24 @@ @@
 #  Copyright 2010 Roeland Merks.
+#
 CONFIG += staticlib release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = build_models/lib
 PERLDIR = ./perl
 PARTMPL = VirtualLeafpar.tmpl
 QT += qt3support
 TARGET = vleaf
 TEMPLATE = lib
 LIBXML2DIR = C:\libxml2
 HEADERS = \
  cellbase.h \
  matrix.h \
  output.h \
  parameter.h \
  parse.h \
  random.h \
  simplugin.h \
  UniqueMessage.h \
  vector.h \
  wallbase.h \
  warning.h
@@ @@ -56,19 +54,21 @@ SOURCES = \ @@
  wallbase.cpp \
  warning.cpp
 unix {
  system(rm -f parameter.cpp parameter.h) # this is performed here when qmake is envoked and not in the resulting makefile.
  QMAKE_CXXFLAGS += -fexceptions -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
  LIBS += -lxml2 -lz -lm
+}
 win32 {
  system(DEL parameter.cpp parameter.h)
  LIBXML2DIR = C:\libxml2
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include
+}
 system(perl $$PERLDIR/make_parameter_source.pl $$PARTMPL)
 system(perl $$PERLDIR/make_pardialog_source.pl $$PARTMPL)
 #system(perl $$PERLDIR/make_xmlwritecode.pl -h $$REACTIONS)
+#

0 comments (0 inline, 0 general)