![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/build.xml b/build.xml
index 4844c917e7ecf70678167809d2fe88451f070f8b..86290bb296cd9cdad02ff6c65bf63015a6987a1e 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"/>
+ <!-- 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"/>
+ -->
-->
<target name="init"
description=
- "Do all prepatory tasks, like make directories and copy files">
+ "Do all preparatory tasks, like make directories and copy files">
<!-- example of the <pkg-config> task
#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
/* shared whiteboard */
#define WITH_INKBOARD 1
#define HAVE_SSL 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="dom/odf/SvgOdg.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="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"/>
-DHAVE_CONFIG_H
-DXP_WIN <!-- for JS -->
-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; }" <!-- inkboard -->
</defines>
<includes>
-I${gtk}/include/libxml2
-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 -->
objcopycommand="${archutil}objcopy"
>
<flags>
+ -mwindows
</flags>
<fileset dir="${build}">
<include name="inkres.o"/>
-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 -lpython24
+ -L${gtk}/python/libs -lpython25
${gtk}/bin/libxml2.dll
+ ${gtk}/bin/libxslt.dll
+ -lpoppler-cairo -lpoppler
+ -lcairo.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 -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
+ -llcms.dll
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc
+ -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+ <!-- 2geom -->
+ <!-- -l2geom -->
</libs>
</link>
</target>
<!-- PYTHON -->
-L${gtk}/python/libs -lpython24
${gtk}/bin/libxml2.dll
+ ${gtk}/bin/libxslt.dll
${gtk}/lib/iconv.lib
-lfreetype.dll -lfontconfig.dll
-llcms.dll
<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"/>
<!-- GTK -->
<copy todir="${dist}"> <fileset dir="${gtk}/etc"/> </copy>
- <copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>
<copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/gtk-2.0"/> </copy>
<copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/glib-2.0"/> </copy>
<copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/locale"/> </copy>
<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}"/>
<!-- PYTHON -->
- <copy file="${gtk}/python/python24.dll" todir="${dist}"/>
+ <copy file="${gtk}/python/python25.dll" todir="${dist}"/>
<copy file="${gtk}/python/python.exe" todir="${dist}/python"/>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/Lib"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/DLLs"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/Scripts"/> </copy>
+ <!--<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-toolbar-icon-size = small-toolbar
+
+ # disable images in buttons. i've only seen ugly delphi apps use this feature.
+ gtk-button-images = 0
+
+ # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
+ # the office apps use them heavily, though.
+ gtk-menu-images = 1
+
+ # use the win32 button ordering instead of the GNOME HIG one, where applicable
+ gtk-alternative-button-order = 1
+
+ style "msw-default"
+ {
+ GtkWidget::interior-focus = 1
+ GtkOptionMenu::indicator-size = { 9, 5 }
+ GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 }
+ GtkSpinButton::shadow-type = in
+
+ # Owen and I disagree that these should be themable
+ #GtkUIManager::add-tearoffs = 0
+ #GtkComboBox::add-tearoffs = 0
+
+ GtkComboBox::appears-as-list = 1
+ GtkComboBox::focus-on-click = 0
+
+ GOComboBox::add_tearoffs = 0
+
+ GtkTreeView::allow-rules = 0
+ GtkTreeView::expander-size = 12
+
+ GtkExpander::expander-size = 12
+
+ GtkScrolledWindow::scrollbar_spacing = 1
+
+ GtkSeparatorMenuItem::horizontal-padding = 2
+
+ engine "wimp"
+ {
+ }
+ }
+ class "*" style "msw-default"
+ </makefile>
+
</target>