diff --git a/build.xml b/build.xml
index 7e152429d8c9e2c1bc24b8fada9da0ea08239bf8..d6259f4c61e69fc0fddd14b107dbac7df20d4f63 100644 (file)
--- a/build.xml
+++ b/build.xml
<!-- set global properties for this build -->
<property name="version" value="0.46dev"/>
- <property name="arch" value="i686-pc-mingw32-"/>
- <!--<property name="archutil" value="${arch}"/>-->
- <property name="archutil" value=""/>
<property name="src" location="src"/>
- <property name="gtk" location="c:/gtk210"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="dist" location="inkscape"/>
- <property name="boost" location="c:/boost"/>
+
+ <!-- Use these settings for the native compiler -->
+ <!-- -->
+ <property name="arch" value="mingw32-"/>
+ <property name="archutil" value=""/>
+ <property name="gtk" location="c:/devlibs"/>
+ <!-- -->
+
+ <!-- Use these settings for the cross compiler -->
+ <!--
+ <property name="arch" value="i686-pc-mingw32-"/>
+ <property name="archutil" value="${arch}"/>
+ <property name="gtk" location="/target"/>
+ -->
#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
/* 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_ */
</makefile>
destdir="${build}/obj">
<fileset dir="${src}">
<!-- THINGS TO EXCLUDE -->
+ <exclude name="2geom/chebyshev.cpp"/>
<exclude name="ast/.*"/>
<exclude name="bonobo/.*"/>
<exclude name="deptool.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="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
<exclude name="jabber_whiteboard/node-tracker.cpp"/>
<exclude name="jabber_whiteboard/node-utilities.cpp"/>
- <!--WHITEBOARD-->
+ <!--OVERLAP-->
<exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
<exclude name="removeoverlap/placement_SolveVPSC.h"/>
<exclude name="removeoverlap/test.cpp"/>
<exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
<exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
- <exclude name="extension/internal/bitmap/.*"/>
</fileset>
<flags>
- -Wall -O3
+ -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+ -O2
-mms-bitfields
</flags>
<defines>
-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
<!-- PERL -->
-Wno-comment -I${gtk}/perl/lib/CORE
<!-- PYTHON -->
-I${gtk}/python/include
- <!-- 2geom -->
- <!-- -I${gtk}/include/2geom -->
- -I${boost}
</includes>
</cc>
</target>
<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>
<fileset dir="${build}">
<include name="inkres.o"/>
</fileset>
<libs>
-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
<!-- PERL -->
-L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
-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
<!-- 2geom -->
<!-- -l2geom -->
</libs>
<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}">
</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
- -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 -->
- -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
</libs>
</link>
</target>
<!-- 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="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libpoppler-2.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>
- <copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>
- <copy file="${gtk}/bin/xmlparse.dll" tofile="${dist}/libexpat.dll"/>
+ <copy file="${gtk}/bin/libxslt.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libexpat.dll" todir="${dist}"/>
+ <!--<copy file="${gtk}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+ <copy file="${gtk}/bin/libwpg-0.1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpg-stream-0.1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpd-0.8.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
<copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
<copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>
<copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>
<copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>
- <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libpopt-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>
<copy file="${gtk}/bin/intl.dll" todir="${dist}"/>
<copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
<mkdir dir="${dist}/plugins"/>
<copy file="${gtk}/bin/gdb.exe" todir="${dist}"/>
+ <!-- Necessary to run extensions on windows if it is not in the path -->
+ <copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
+ <copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
+
<!-- PERL -->
<copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>