X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=c13f7a4b16131fbc41c4390dd4eeeef4eff8baf8;hb=f61e22edfbabba7d9ffdfb87c7661a372989e858;hp=cce73cf4820f2fb872677ba1bbc01f85ade9e1f0;hpb=dad9227b9d3e5fa25518275f2fc2b75780f07437;p=inkscape.git
diff --git a/build.xml b/build.xml
index cce73cf48..c13f7a4b1 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,7 @@
-
+
@@ -201,7 +201,6 @@
-
@@ -210,7 +209,6 @@
-
@@ -269,7 +267,7 @@
-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
- -O3
+ -O2
-mms-bitfields
@@ -373,8 +371,7 @@
+ objcopycommand="${archutil}objcopy">
-mwindows
@@ -387,7 +384,7 @@
-L${gtk}/lib
-lpoppler-cairo -lpoppler-glib -lpoppler.dll
- -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
+ -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
@@ -400,7 +397,8 @@
${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
@@ -438,8 +436,7 @@
+ objcopycommand="${archutil}objcopy">
@@ -449,24 +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
@@ -478,12 +480,12 @@
## T A R G E T : D I S T
########################################################################
-->
-
-
+
@@ -574,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.