X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=68a3162d9f83fd73bb733c0fccf0fe93a56c827a;hb=a95be1234ba4df33d6d074589edaa56f0d546069;hp=bbe288166ccc30617fa108ba3310a54b30a911b3;hpb=62d37a4d5f825304593665ab77a0ab91db82bd71;p=inkscape.git
diff --git a/build.xml b/build.xml
index bbe288166..68a3162d9 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
* Bob Jamison
* Others
*
- * Copyright (C) 2006-2007 Inkscape.org
+ * Copyright (C) 2006-2008 Inkscape.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,8 +26,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ description=
+ "Do all preparatory tasks, like make directories and copy files">
+
+
+
+
+
+
@@ -70,7 +96,7 @@
- #define INKSCAPE_VERSION "${version}+devel"
+ #define INKSCAPE_VERSION "${version}"
#ifndef _CONFIG_H_
@@ -109,6 +135,7 @@
#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
@@ -125,6 +152,23 @@
#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
+
+ /* Allow reading WordPerfect? */
+ #define WITH_LIBWPG 1
#endif /* _CONFIG_H_ */
@@ -155,120 +199,114 @@
-
+ destdir="${build}/obj"
+ continueOnError="true"
+ refreshCache="${refresh}">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- -Wall -O3
+ -Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+ -O2
-mms-bitfields
-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}/include/gtkmm-2.4
- -I${gtk}/lib/gtkmm-2.4/include
- -I${gtk}/include/gdkmm-2.4
- -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}/include/gtk-2.0
- -I${gtk}/lib/gtk-2.0/include
- -I${gtk}/include/atk-1.0
- -I${gtk}/include/pango-1.0
- -I${gtk}/include/glib-2.0
- -I${gtk}/lib/glib-2.0/include
-
+
+ ${pcc.gtkmm-2.4}
+
-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
+ -I${gtk}/include/gc
+ -I${gtk}/include/libwpg-0.1
+ -I${gtk}/include/libwpd-0.8
+
+
+
+ -I${gtk}/python/include
+
+ -I${src}/bind/javainc -I${src}/bind/javainc/win32
-
+
@@ -281,12 +319,12 @@
description="create a static library">
-
-
-
-
-
-
+
+
+
+
+
+
@@ -301,9 +339,9 @@
-
-
-
+
+
+
@@ -319,46 +357,52 @@
description="link objects and library to create executable">
-
- --include-dir=${src}
-
-
+ file="${src}/inkscape.rc"
+ out="${build}/inkres.o">
+
+ --include-dir=${src}
+
+
+ objcopycommand="${archutil}objcopy">
+ -mwindows
-
-
-
-
-
-
-
- -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
- -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
+
+
+
+
+
+
+
+ -L${gtk}/lib
+ -lpoppler-cairo -lpoppler-glib -lpoppler.dll
+ ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0}
- -L${gtk}/perl/lib/CORE -lperl58
+
- -L${gtk}/python/libs -lpython24
+
${gtk}/bin/libxml2.dll
+ ${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 -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
-
-
+ -llcms.dll
+ -lgsl
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc
+ -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+
+
+
+
@@ -374,45 +418,45 @@
description="link objects and library to create Inkview executable">
-
- --include-dir=${src}
-
-
+ file="${src}/inkview.rc"
+ out="${build}/inkviewres.o">
+
+ --include-dir=${src}
+
+
+ objcopycommand="${archutil}objcopy">
-
- < include name="inkviewres.o"/ >
-
-
-
-
- -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
- -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
+
+
+
+
+
+
+ -L${gtk}/lib
+ -lpoppler-cairo -lpoppler-glib -lpoppler.dll
+ ${pcl.gtkmm-2.4}
- -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
+ ${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
+
+
@@ -427,7 +471,7 @@
-
+
@@ -451,6 +495,7 @@
+
@@ -458,54 +503,159 @@
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+ 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-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"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -516,7 +666,7 @@
## T A R G E T : D I S T - A L L
########################################################################
-->
-
@@ -526,12 +676,13 @@
+
-