X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=a3fe9f31ca2fc48681792ac10d64faa7a45345f4;hb=0dd12485e26b98c7eb9963768ec4bd9869186d98;hp=d6668624857689a24d103eac4f99bd6cd1fc04fa;hpb=6ddfd24ddde617960bd5322ad899c7778404d911;p=inkscape.git
diff --git a/build.xml b/build.xml
index d66686248..a3fe9f31c 100644
--- a/build.xml
+++ b/build.xml
@@ -70,7 +70,7 @@
- #define INKSCAPE_VERSION "${version}+devel"
+ #define INKSCAPE_VERSION "${version}+devel"
#ifndef _CONFIG_H_
@@ -125,6 +125,13 @@
#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
#endif /* _CONFIG_H_ */
@@ -156,77 +163,77 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-Wall -O3
-mms-bitfields
@@ -235,40 +242,39 @@
-DVERSION=\"${version}\"
-DHAVE_CONFIG_H
-DXP_WIN
- -D_INTL_REDIRECT_INLINE
+ -D_INTL_REDIRECT_INLINE
-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
+
+ -Wno-comment -I${gtk}/perl/lib/CORE
+
+ -I${gtk}/python/include
-
+
@@ -281,12 +287,12 @@
description="create a static library">
-
-
-
-
-
-
+
+
+
+
+
+
@@ -301,9 +307,9 @@
-
-
-
+
+
+
@@ -319,12 +325,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
@@ -347,7 +353,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
@@ -357,8 +363,8 @@
-lssl -lcrypto
-lpng -lpopt ${gtk}/lib/zdll.lib
-lgc -mwindows -lws2_32 -lintl -lm
-
-
+
+
@@ -374,12 +380,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
@@ -401,7 +407,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
@@ -411,8 +417,8 @@
-lssl -lcrypto
-lpng -lpopt ${gtk}/lib/zdll.lib
-lgc -mwindows -lws2_32 -lintl -lm
-
-
+
+
@@ -473,10 +479,10 @@
-
-
-
-
+
+
+
+
@@ -485,10 +491,10 @@
-
-
-
-
+
+
+
+
@@ -537,6 +543,7 @@
+