X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=c13f7a4b16131fbc41c4390dd4eeeef4eff8baf8;hb=f61e22edfbabba7d9ffdfb87c7661a372989e858;hp=c07d9b85ddc29328ae413893db2f1b4705961fa3;hpb=adb5b4bae27b11a3c7739614c44b0762a51dcdc0;p=inkscape.git
diff --git a/build.xml b/build.xml
index c07d9b85d..c13f7a4b1 100644
--- a/build.xml
+++ b/build.xml
@@ -41,17 +41,25 @@
-
-
-
-
+
-
+
+
+
+
+
+
+
+
@@ -62,7 +70,7 @@
-->
+ "Do all preparatory tasks, like make directories and copy files">
+
-
@@ -190,7 +209,6 @@
-
@@ -240,7 +258,7 @@
-
+
@@ -248,7 +266,8 @@
- -Wall -O3
+ -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+ -O2
-mms-bitfields
@@ -283,6 +302,10 @@
-I${gtk}/include/libxml2
-I${gtk}/include/freetype2
-I${gtk}/include/cairo
+ -I${gtk}/include/poppler
+ -I${gtk}/include/gc
+ -I${gtk}/include/libwpg-0.1
+ -I${gtk}/include/libwpd-0.8
-Wno-comment -I${gtk}/perl/lib/CORE
@@ -348,9 +371,9 @@
+ objcopycommand="${archutil}objcopy">
+ -mwindows
@@ -360,23 +383,33 @@
-L${gtk}/lib
- -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
+ -lpoppler-cairo -lpoppler-glib -lpoppler.dll
+ -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
-lgdk_pixbuf-2.0
-lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
- -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
+ -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0
-L${gtk}/perl/lib/CORE -lperl58
-L${gtk}/python/libs -lpython25
${gtk}/bin/libxml2.dll
+ ${gtk}/bin/libxslt.dll
+ -lcairo.dll
+ -lcairomm-1.0.dll
+ -lwpg-0.1.dll -lwpg-stream-0.1.dll
+ -lwpd-0.8.dll -lwpd-stream-0.8.dll
${gtk}/lib/iconv.lib
+ -lMagick++ -lWand -lMagick
-lfreetype.dll -lfontconfig.dll
- -llcms.dll
-lssl -lcrypto
- -lpng -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
+ -llcms.dll
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc
+ -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+
+
@@ -403,8 +436,7 @@
+ objcopycommand="${archutil}objcopy">
@@ -414,23 +446,29 @@
-L${gtk}/lib
+ -lpoppler-cairo -lpoppler-glib -lpoppler.dll
-lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
-lgdk_pixbuf-2.0
-lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
- -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
+ -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo -lcairomm-1.0
-L${gtk}/perl/lib/CORE -lperl58
- -L${gtk}/python/libs -lpython24
+ -L${gtk}/python/libs -lpython25
${gtk}/bin/libxml2.dll
+ ${gtk}/bin/libxslt.dll
${gtk}/lib/iconv.lib
+ -lcairo.dll -lcairomm-1.0.dll
+ -lwpg-0.1.dll -lwpg-stream-0.1.dll
+ -lMagick++ -lWand -lMagick
-lfreetype.dll -lfontconfig.dll
-llcms.dll
-lssl -lcrypto
- -lpng -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc -mwindows
+ -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
@@ -442,12 +480,12 @@
## T A R G E T : D I S T
########################################################################
-->
-
-
+
@@ -471,6 +509,7 @@
+
@@ -478,8 +517,13 @@
-
-
+
+
+
+
+
+
+
@@ -487,7 +531,7 @@
-
+
@@ -516,6 +560,10 @@
+
+
+
+
@@ -528,7 +576,7 @@
- gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
+ gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
gtk-toolbar-icon-size = small-toolbar
# disable images in buttons. i've only seen ugly delphi apps use this feature.