X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=7c3b67b882b6d9dd04223d96c77dad60bdd2904f;hb=9e6986253f61fe5a9c6be87c471cded15e5f3aac;hp=7e152429d8c9e2c1bc24b8fada9da0ea08239bf8;hpb=981b809bc6ed10a21e89444d9447e5475801874f;p=inkscape.git
diff --git a/build.xml b/build.xml
index 7e152429d..7c3b67b88 100644
--- a/build.xml
+++ b/build.xml
@@ -41,16 +41,25 @@
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -120,6 +129,7 @@
#define HAVE_MALLOC_H 1
#define HAVE_STDLIB_H 1
#define HAVE_SYS_STAT_H 1
+ #define HAVE_INTTYPES_H 1
#define ENABLE_LCMS 1
@@ -146,6 +156,13 @@
/* use poppler for pdf import? */
#define HAVE_POPPLER 1
+ #define HAVE_POPPLER_CAIRO 1
+
+ /* do we want bitmap manipulation? */
+ #define WITH_IMAGE_MAGICK 1
+
+ /* Allow reading WordPerfect? */
+ #define WITH_LIBWPG 1
#endif /* _CONFIG_H_ */
@@ -179,6 +196,7 @@
destdir="${build}/obj">
+
@@ -192,7 +210,6 @@
-
@@ -242,16 +259,16 @@
-
+
-
- -Wall -O3
+ -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+ -O2
-mms-bitfields
@@ -287,13 +304,13 @@
-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
-I${gtk}/python/include
-
-
- -I${boost}
@@ -355,9 +372,9 @@
+ objcopycommand="${archutil}objcopy">
+ -mwindows
@@ -367,24 +384,31 @@
-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
- -lpoppler
+ ${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 -ljpeg.dll -lpopt ${gtk}/lib/zdll.lib
- -lgc -mconsole -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+ -llcms.dll
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc
+ -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
@@ -413,8 +437,7 @@
+ objcopycommand="${archutil}objcopy">
@@ -424,23 +447,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
@@ -452,12 +481,12 @@
## T A R G E T : D I S T
########################################################################
-->
-
-
+
@@ -481,6 +510,7 @@
+
@@ -488,8 +518,13 @@
-
-
+
+
+
+
+
+
+
@@ -497,7 +532,7 @@
-
+
@@ -526,6 +561,10 @@
+
+
+
+
@@ -538,7 +577,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.