# HG changeset patch
# User Michael Guravage <michael.guravage@cwi.nl>
# Date 2010-04-29 21:57:16
# Node ID bc8eb2c3f85f8a550dba98a0c70f8cf0ed45765c
# Parent  7e16256a76f6b726ac6a4b06b0194066e6a2d5ec

Corrected several inclusion paths; and defined LIBXML_STATIC.

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
@@ -38,8 +38,10 @@ unix {
 
 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
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
@@ -38,8 +38,10 @@ unix {
 
 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
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
@@ -38,8 +38,10 @@ unix {
 
 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
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
@@ -21,7 +21,7 @@
 
 
 BINDIR = ../../bin
-CONFIG += plugin release
+CONFIG += plugin debug #release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = test
@@ -39,9 +39,11 @@ unix {
 
 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
diff --git a/src/libplugin.pro b/src/libplugin.pro
--- a/src/libplugin.pro
+++ b/src/libplugin.pro
@@ -19,7 +19,7 @@
 #  Copyright 2010 Roeland Merks.
 #
 
-CONFIG += staticlib release
+CONFIG += staticlib debug #release
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = build_models/lib 
 PERLDIR = ./perl
@@ -64,8 +64,9 @@ unix {
 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)