X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=bd798ea685fe236e26bf0e33c0acbc027a0bd620;hb=ec8021b96ba181202dd19e74997e97d2c5f1ecf3;hp=843b24c46af247362662aa141b7242417d5da68c;hpb=7092ea0fb59c2fd1af2285468a955620e3889e81;p=inkscape.git
diff --git a/build.xml b/build.xml
index 843b24c46..bd798ea68 100644
--- a/build.xml
+++ b/build.xml
@@ -61,7 +61,19 @@
########################################################################
-->
+ description=
+ "Do all preparatory tasks, like make directories and copy files">
+
+
+
+
@@ -70,7 +82,7 @@
- #define INKSCAPE_VERSION "${version}+devel"
+ #define INKSCAPE_VERSION "${version}+devel"
#ifndef _CONFIG_H_
@@ -125,6 +137,16 @@
#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
#endif /* _CONFIG_H_ */
@@ -139,7 +161,9 @@
-->
-
+
+
+
@@ -154,77 +178,78 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-Wall -O3
-mms-bitfields
@@ -233,40 +258,41 @@
-DVERSION=\"${version}\"
-DHAVE_CONFIG_H
-DXP_WIN
- -D_INTL_REDIRECT_INLINE
+ -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; }"
- -DWITH_INKBOARD -DHAVE_SSL
-I${gtk}/include
-
+
-I${gtk}/include/glibmm-2.4
- -I${gtk}/lib/glibmm-2.4/include
+ -I${gtk}/lib/glibmm-2.4/include
-I${gtk}/include/gtkmm-2.4
- -I${gtk}/lib/gtkmm-2.4/include
+ -I${gtk}/lib/gtkmm-2.4/include
-I${gtk}/include/gdkmm-2.4
- -I${gtk}/lib/gdkmm-2.4/include
+ -I${gtk}/lib/gdkmm-2.4/include
-I${gtk}/include/pangomm-1.4
-I${gtk}/include/atkmm-1.6
-I${gtk}/include/cairomm-1.0
-I${gtk}/include/sigc++-2.0
- -I${gtk}/lib/sigc++-2.0/include
+ -I${gtk}/lib/sigc++-2.0/include
-I${gtk}/include/gtk-2.0
- -I${gtk}/lib/gtk-2.0/include
+ -I${gtk}/lib/gtk-2.0/include
-I${gtk}/include/atk-1.0
- -I${gtk}/include/pango-1.0
+ -I${gtk}/include/pango-1.0
-I${gtk}/include/glib-2.0
- -I${gtk}/lib/glib-2.0/include
-
+ -I${gtk}/lib/glib-2.0/include
+
-I${gtk}/include/libxml2
- -I${gtk}/include/freetype2
- -I${gtk}/include/cairo
-
- -Wno-comment -I${gtk}/perl/lib/CORE
-
- -I${gtk}/python/include
+ -I${gtk}/include/freetype2
+ -I${gtk}/include/cairo
+ -I${gtk}/include/poppler
+
+ -Wno-comment -I${gtk}/perl/lib/CORE
+
+ -I${gtk}/python/include
-
+
@@ -279,12 +305,12 @@
description="create a static library">
-
-
-
-
-
-
+
+
+
+
+
+
@@ -299,9 +325,9 @@
-
-
-
+
+
+
@@ -317,12 +343,12 @@
description="link objects and library to create executable">
-
- --include-dir=${src}
-
-
+ file="${src}/inkscape.rc"
+ out="${build}/inkres.o">
+
+ --include-dir=${src}
+
+
-
-
-
-
-
-
-
- -L${gtk}/lib
+
+
+
+
+
+
+
+ -L${gtk}/lib
-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
@@ -345,18 +371,19 @@
-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
- -L${gtk}/perl/lib/CORE -lperl58
+ -L${gtk}/perl/lib/CORE -lperl58
- -L${gtk}/python/libs -lpython24
+ -L${gtk}/python/libs -lpython25
${gtk}/bin/libxml2.dll
+ -lpoppler
${gtk}/lib/iconv.lib
-lfreetype.dll -lfontconfig.dll
-llcms.dll
-lssl -lcrypto
- -lpng -lpopt ${gtk}/lib/zdll.lib
+ -lpng -ljpeg.dll -lpopt ${gtk}/lib/zdll.lib
-lgc -mwindows -lws2_32 -lintl -lm
-
-
+
+
@@ -372,12 +399,12 @@
description="link objects and library to create Inkview executable">
-
- --include-dir=${src}
-
-
+ file="${src}/inkview.rc"
+ out="${build}/inkviewres.o">
+
+ --include-dir=${src}
+
+
-
- < include name="inkviewres.o"/ >
-
-
-
-
- -L${gtk}/lib
+
+
+
+
+
+
+ -L${gtk}/lib
-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
@@ -399,7 +426,7 @@
-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
- -L${gtk}/perl/lib/CORE -lperl58
+ -L${gtk}/perl/lib/CORE -lperl58
-L${gtk}/python/libs -lpython24
${gtk}/bin/libxml2.dll
@@ -409,8 +436,8 @@
-lssl -lcrypto
-lpng -lpopt ${gtk}/lib/zdll.lib
-lgc -mwindows -lws2_32 -lintl -lm
-
-
+
+
@@ -457,6 +484,7 @@
+
@@ -471,22 +499,21 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
@@ -498,12 +525,59 @@
-
+
+
+
+ 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"
+
+
@@ -535,6 +609,7 @@
+