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

Changeset - bc8eb2c3f85f

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

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

Corrected several inclusion paths; and defined LIBXML_STATIC.

5 files changed with 16 insertions and 7 deletions:

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/build_models/plugin_auxingrowth.pro

➞

Show inline comments

@@ @@ -35,11 +35,13 @@ unix { @@
  QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include  -I$${LIBICONVDIR}\include
+}
 # finis

src/build_models/plugin_leaf.pro

➞

Show inline comments

@@ @@ -35,11 +35,13 @@ unix { @@
  QMAKE_CXXFLAGS += -fexceptions -fPIC -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include  -I$${LIBICONVDIR}\include
+}
 # finis

src/build_models/plugin_meinhardt.pro

➞

Show inline comments

@@ @@ -35,12 +35,14 @@ unix { @@
  QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -fexceptions -IC:\strawberry\c\include -I$${LIBXML2DIR}\include
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include  -I$${LIBICONVDIR}\include
+}
 # finis

src/build_models/plugin_test.pro

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ @@
+#
 #  Copyright 2010 Roeland Merks.
+#
 BINDIR = ../../bin
 CONFIG += plugin release
+CONFIG += plugin debug #release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = test
 HEADERS = ../simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -I..
 QT += qt3support
@@ @@ -36,12 +36,14 @@ unix { @@
  QMAKE_CXXFLAGS += -fexceptions -I/usr/include/libxml2
  QMAKE_LFLAGS += -fPIC
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBS += -Llib -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include  -I$${LIBICONVDIR}\include
+}
 # finis

src/libplugin.pro

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
 #  You should have received a copy of the GNU General Public License
 #  along with the Virtual Leaf.  If not, see <http://www.gnu.org/licenses/>.
+#
 #  Copyright 2010 Roeland Merks.
+#
 CONFIG += staticlib release
+CONFIG += staticlib debug #release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = build_models/lib
 PERLDIR = ./perl
 PARTMPL = VirtualLeafpar.tmpl
 QT += qt3support
 TARGET = vleaf
@@ @@ -61,14 +61,15 @@ unix { @@
  LIBS += -lxml2 -lz -lm
+}
 win32 {
  system(DEL parameter.cpp parameter.h)
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include
+ QMAKE_CXXFLAGS += -fexceptions -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\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)