![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/build.xml b/build.xml
index 4f7afe4ed7da81027a8a59ac9237c0e324dbcfd2..8280b32305a970c2b80df257a8a8c8c731ea6591 100644 (file)
--- a/build.xml
+++ b/build.xml
-
-
<!--
########################################################################
## T A R G E T : I N I T
########################################################################
-->
<target name="init"
- description="Create the build directory structure used by compile">
+ description=
+ "Do all preparatory tasks, like make directories and copy files">
+
+
+ <!-- example of the <pkg-config> task
+ query can be cflags, libs, or both
+ prefix overrides the value of prefix="" in the file
+ the result of this entry can be later used as ${gtkmm}
+ -->
+ <!--
+ <pkg-config name="gtkmm-2.4" path="${gtk}/lib/pkgconfig"
+ query="both" property="gtkmm" prefix="${gtk}"/>
+ -->
<mkdir dir="${build}"/>
<mkdir dir="${dist}"/>
#define RENDER_WITH_PANGO_CAIRO 1
#define HAVE_GTK_WINDOW_FULLSCREEN 1
+
+ /* internal interpreter */
+ #define WITH_PYTHON 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
#endif /* _CONFIG_H_ */
</makefile>
<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"/>
-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 -->
- -DWITH_INKBOARD -DHAVE_SSL <!-- inkboard -->
</defines>
<includes>
-I${gtk}/include
-I${gtk}/include/libxml2
-I${gtk}/include/freetype2
-I${gtk}/include/cairo
+ -I${gtk}/include/poppler
<!-- 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
+ -lpoppler-cairo -lpoppler
+ -lcairo.dll
${gtk}/lib/iconv.lib
-lfreetype.dll -lfontconfig.dll
- -llcms.dll
-lssl -lcrypto
- -lpng -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
+ -lMagick++ -lWand -lMagick
+ -llcms.dll
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+ <!-- 2geom -->
+ <!-- -l2geom -->
</libs>
</link>
</target>
<flags>
</flags>
<fileset dir="${build}">
- < include name="inkviewres.o"/ >
+ <include name="inkviewres.o"/>
<include name="obj/inkview.o"/>
<include name="libinkscape.a"/>
</fileset>
<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/jpeg62.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
<!-- 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>
<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>