diff --git a/build.xml b/build.xml
index cce73cf4820f2fb872677ba1bbc01f85ade9e1f0..c13f7a4b16131fbc41c4390dd4eeeef4eff8baf8 100644 (file)
--- a/build.xml
+++ b/build.xml
</description>
<!-- set global properties for this build -->
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.46dev"/>
+ <property name="version" value="0.45+devel"/>
<property name="src" location="src"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="src" location="src"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<exclude name="bonobo/.*"/>
<exclude name="deptool.cpp"/>
<exclude name="test-all.cpp"/>
<exclude name="bonobo/.*"/>
<exclude name="deptool.cpp"/>
<exclude name="test-all.cpp"/>
- <exclude name="dialogs/filedialog-win32.cpp"/>
<exclude name="display/testnr.cpp"/>
<exclude name="display/bezier-utils-test.cpp"/>
<exclude name="dom/jsdombind.cpp"/>
<exclude name="display/testnr.cpp"/>
<exclude name="display/bezier-utils-test.cpp"/>
<exclude name="dom/jsdombind.cpp"/>
<exclude name="extension/api.cpp"/>
<exclude name="extension/dxf2svg/.*"/>
<exclude name="extension/implementation/plugin.cpp"/>
<exclude name="extension/api.cpp"/>
<exclude name="extension/dxf2svg/.*"/>
<exclude name="extension/implementation/plugin.cpp"/>
- <exclude name="extension/internal/gnome.cpp"/>
<exclude name="extension/script/bindtest.cpp"/>
<exclude name="extension/script/cpptest.cpp"/>
<exclude name="extension/plugin/.*"/>
<exclude name="extension/script/bindtest.cpp"/>
<exclude name="extension/script/cpptest.cpp"/>
<exclude name="extension/plugin/.*"/>
</fileset>
<flags>
-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
</fileset>
<flags>
-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
- -O3
+ -O2
-mms-bitfields
</flags>
<defines>
-mms-bitfields
</flags>
<defines>
<link command="${arch}g++" out="${build}/inkscape.exe"
strip="true" symfile="${build}/inkscape.dbg"
stripcommand="${archutil}strip"
<link command="${arch}g++" out="${build}/inkscape.exe"
strip="true" symfile="${build}/inkscape.dbg"
stripcommand="${archutil}strip"
- objcopycommand="${archutil}objcopy"
- >
+ objcopycommand="${archutil}objcopy">
<flags>
-mwindows
</flags>
<flags>
-mwindows
</flags>
<libs>
-L${gtk}/lib
-lpoppler-cairo -lpoppler-glib -lpoppler.dll
<libs>
-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
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
-lgdk_pixbuf-2.0
${gtk}/bin/libxml2.dll
${gtk}/bin/libxslt.dll
-lcairo.dll
${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
-lwpd-0.8.dll -lwpd-stream-0.8.dll
${gtk}/lib/iconv.lib
-lMagick++ -lWand -lMagick
<link command="${arch}g++" out="${build}/inkview.exe"
strip="true" symfile="${build}/inkview.dbg"
stripcommand="${archutil}strip"
<link command="${arch}g++" out="${build}/inkview.exe"
strip="true" symfile="${build}/inkview.dbg"
stripcommand="${archutil}strip"
- objcopycommand="${archutil}objcopy"
- >
+ objcopycommand="${archutil}objcopy">
<flags>
</flags>
<fileset dir="${build}">
<flags>
</flags>
<fileset dir="${build}">
</fileset>
<libs>
-L${gtk}/lib
</fileset>
<libs>
-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
-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
<!-- PERL -->
-L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
<!-- PERL -->
-L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
- -L${gtk}/python/libs -lpython24
+ -L${gtk}/python/libs -lpython25
${gtk}/bin/libxml2.dll
${gtk}/bin/libxslt.dll
${gtk}/lib/iconv.lib
${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
-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
</libs>
</link>
</target>
</libs>
</link>
</target>
## T A R G E T : D I S T
########################################################################
-->
## T A R G E T : D I S T
########################################################################
-->
- <target name="dist" depends="link,i18n"
+ <target name="dist" depends="link,linkinkview,i18n"
description="generate the distribution directory with all needed files">
<!-- Create the distribution directory -->
<copy file="${build}/inkscape.exe" todir="${dist}"/>
description="generate the distribution directory with all needed files">
<!-- Create the distribution directory -->
<copy file="${build}/inkscape.exe" todir="${dist}"/>
- <copy file="${build}/inkscape.dbg" todir="${dist}"/>
+ <copy file="${build}/inkscape.dbg" todir="${dist}"/>
<copy file="AUTHORS" todir="${dist}"/>
<copy file="COPYING" todir="${dist}"/>
<copy file="COPYING.LIB" todir="${dist}"/>
<copy file="AUTHORS" todir="${dist}"/>
<copy file="COPYING" todir="${dist}"/>
<copy file="COPYING.LIB" todir="${dist}"/>
<!--<copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
<makefile file="${dist}/etc/gtk-2.0/gtkrc">
<!--<copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
<makefile file="${dist}/etc/gtk-2.0/gtkrc">
- 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.
gtk-toolbar-icon-size = small-toolbar
# disable images in buttons. i've only seen ugly delphi apps use this feature.