X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=68a3162d9f83fd73bb733c0fccf0fe93a56c827a;hb=a95be1234ba4df33d6d074589edaa56f0d546069;hp=cce73cf4820f2fb872677ba1bbc01f85ade9e1f0;hpb=dad9227b9d3e5fa25518275f2fc2b75780f07437;p=inkscape.git
diff --git a/build.xml b/build.xml
index cce73cf48..68a3162d9 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
* Bob Jamison
* Others
*
- * Copyright (C) 2006-2007 Inkscape.org
+ * Copyright (C) 2006-2008 Inkscape.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,8 +26,6 @@
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -90,7 +96,7 @@
- #define INKSCAPE_VERSION "${version}+devel"
+ #define INKSCAPE_VERSION "${version}"
#ifndef _CONFIG_H_
@@ -193,7 +199,9 @@
+ destdir="${build}/obj"
+ continueOnError="true"
+ refreshCache="${refresh}">
@@ -201,16 +209,13 @@
-
-
-
@@ -267,15 +272,17 @@
+
+
+
- -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
- -O3
+ -Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+ -O2
-mms-bitfields
-DVERSION=\"${version}\"
-DHAVE_CONFIG_H
- -DXP_WIN
-D_INTL_REDIRECT_INLINE
-DHAVE_SSL
-DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }"
@@ -283,23 +290,7 @@
-I${gtk}/include
- -I${gtk}/include/glibmm-2.4
- -I${gtk}/lib/glibmm-2.4/include
- -I${gtk}/include/gtkmm-2.4
- -I${gtk}/lib/gtkmm-2.4/include
- -I${gtk}/include/gdkmm-2.4
- -I${gtk}/lib/gdkmm-2.4/include
- -I${gtk}/include/pangomm-1.4
- -I${gtk}/include/atkmm-1.6
- -I${gtk}/include/cairomm-1.0
- -I${gtk}/include/sigc++-2.0
- -I${gtk}/lib/sigc++-2.0/include
- -I${gtk}/include/gtk-2.0
- -I${gtk}/lib/gtk-2.0/include
- -I${gtk}/include/atk-1.0
- -I${gtk}/include/pango-1.0
- -I${gtk}/include/glib-2.0
- -I${gtk}/lib/glib-2.0/include
+ ${pcc.gtkmm-2.4}
-I${gtk}/include/libxml2
-I${gtk}/include/freetype2
@@ -309,9 +300,11 @@
-I${gtk}/include/libwpg-0.1
-I${gtk}/include/libwpd-0.8
- -Wno-comment -I${gtk}/perl/lib/CORE
+
-I${gtk}/python/include
+
+ -I${src}/bind/javainc -I${src}/bind/javainc/win32
@@ -373,8 +366,7 @@
+ objcopycommand="${archutil}objcopy">
-mwindows
@@ -387,26 +379,23 @@
-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
+ ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0}
- -L${gtk}/perl/lib/CORE -lperl58
+
- -L${gtk}/python/libs -lpython25
+
${gtk}/bin/libxml2.dll
${gtk}/bin/libxslt.dll
-lcairo.dll
- -lwpg-0.1.dll -lwpg-stream-0.1.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
-lssl -lcrypto
-llcms.dll
+ -lgsl
-lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
@@ -438,8 +427,7 @@
+ objcopycommand="${archutil}objcopy">
@@ -449,24 +437,24 @@
-L${gtk}/lib
- -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
+ -lpoppler-cairo -lpoppler-glib -lpoppler.dll
+ ${pcl.gtkmm-2.4}
-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
@@ -483,7 +471,7 @@
-
+
@@ -507,7 +495,7 @@
-
+
@@ -524,6 +512,8 @@
+
+
@@ -552,6 +542,7 @@
+
@@ -568,13 +559,14 @@
+
- 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.
@@ -622,6 +614,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -639,12 +676,13 @@
+
-