summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2007-08-14 20:54:48 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2007-08-14 20:54:48 +0000
commit55d43e4e27e0ba58a47fad70957dfa989aa173ad (patch)
tree2ccfbac1c50023d08ae32975c876fa2478c1ad2a /build.xml
parentFix for bug #1752113; added set_preview_widget_active(false) to FileSaveDialo... (diff)
downloadinkscape-55d43e4e27e0ba58a47fad70957dfa989aa173ad.tar.gz
inkscape-55d43e4e27e0ba58a47fad70957dfa989aa173ad.zip
Commit LivePathEffect branch to trunk!
(disabled extension/internal/bitmap/*.* in build.xml to fix compilation) (bzr r3472)
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml11
1 files changed, 8 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index bd798ea68..7e152429d 100644
--- a/build.xml
+++ b/build.xml
@@ -50,8 +50,7 @@
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="dist" location="inkscape"/>
-
-
+ <property name="boost" location="c:/boost"/>
@@ -249,6 +248,7 @@
<exclude name="removeoverlap/test.cpp"/>
<exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
<exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
+ <exclude name="extension/internal/bitmap/.*"/>
</fileset>
<flags>
-Wall -O3
@@ -291,6 +291,9 @@
-Wno-comment -I${gtk}/perl/lib/CORE
<!-- PYTHON -->
-I${gtk}/python/include
+ <!-- 2geom -->
+ <!-- -I${gtk}/include/2geom -->
+ -I${boost}
</includes>
</cc>
</target>
@@ -381,7 +384,9 @@
-llcms.dll
-lssl -lcrypto
-lpng -ljpeg.dll -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
+ -lgc -mconsole -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+ <!-- 2geom -->
+ <!-- -l2geom -->
</libs>
</link>
</target>