X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=58e9fba3ea65f52e00a69f9ed026c38286fe4a1d;hb=314cde3be432c9ce1323e7ddc5d4327581358e90;hp=4aa2b882d86df6293413071d4767d322f6056029;hpb=86bb0ec97eef378a8ec2e7a9e019656a6fbbe6f6;p=inkscape.git
diff --git a/build.xml b/build.xml
old mode 100644
new mode 100755
index 4aa2b882d..58e9fba3e
--- a/build.xml
+++ b/build.xml
@@ -36,13 +36,13 @@
Build file for the Inkscape SVG editor. This file
was written for GTK-2.10 on Win32, but it should work
well for other types of builds with only minor adjustments.
- Note that the default target is 'dist'. You can execute other
+ Note that the default target is 'dist-all'. You can execute other
targets instead, by "btool {target}", like "btool compile", if
- you want to save time.
+ you want to save time, or "dist-inkscape" if you don't want inkview.
-
+
@@ -53,8 +53,10 @@
-
+
+
+
@@ -62,6 +64,9 @@
+
+
+
-->
@@ -97,9 +102,14 @@
+
namespace Inkscape {
- char const *version_string = "${version} r${svn.revision}";
+ char const *version_string = "${version} ${bzr.revision}";
}
@@ -141,6 +151,7 @@
#define HAVE_SYS_STAT_H 1
#define HAVE_INTTYPES_H 1
#define HAVE_OPENMP 1
+ #define HAVE_TR1_UNORDERED_SET 1
#define ENABLE_LCMS 1
@@ -162,8 +173,8 @@
#define WITH_PYTHON 1
/* shared whiteboard */
- #define WITH_INKBOARD 1
- #define HAVE_SSL 1
+ #undef WITH_INKBOARD
+ #undef HAVE_SSL
/* use poppler for pdf import? */
#define HAVE_POPPLER 1
@@ -179,7 +190,7 @@
#define ENABLE_SVG_FONTS 1
/* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
- // #define LPE_ENABLE_TEST_EFFECTS 1
+ #define LPE_ENABLE_TEST_EFFECTS 1
#define HAVE_ASPELL 1
@@ -196,13 +207,14 @@
description="generate test files" >
-
+
@@ -213,19 +225,19 @@
-
-
-
@@ -239,7 +251,7 @@
-
@@ -250,20 +262,20 @@
-
-
-
@@ -294,6 +306,7 @@
+
@@ -329,7 +342,6 @@
-
@@ -381,7 +393,8 @@
${pcc.gtkmm-2.4}
- -I${devlibs}/include/libxml2
+ ${pcc.Magick++}
+ ${pcc.libxml-2.0}
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
@@ -467,7 +480,6 @@
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
- -mwindows
-mthreads
@@ -485,16 +497,16 @@
${devlibs}/bin/libxslt.dll
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
- ${devlibs}/lib/iconv.lib
- ${pcl.ImageMagick++}
+ -liconv
+ ${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- -lssl -lcrypto
${pcl.lcms}
${pcl.gsl}
- -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
+ -lpng -ljpeg -ltiff -lpopt -lz
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-lgomp -lpthreadGC2 -laspell
+ -lmscms
@@ -523,7 +535,6 @@
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
- -mwindows
-mthreads
@@ -539,16 +550,16 @@
${devlibs}/bin/libxslt.dll
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
- ${devlibs}/lib/iconv.lib
- ${pcl.ImageMagick++}
+ -liconv
+ ${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- -lssl -lcrypto
${pcl.lcms}
${pcl.gsl}
- -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
+ -lpng -ljpeg -ltiff -lpopt -lz
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms
@@ -590,16 +601,16 @@
${devlibs}/bin/libxslt.dll
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
- ${devlibs}/lib/iconv.lib
- ${pcl.ImageMagick++}
+ -liconv
+ ${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- -lssl -lcrypto
${pcl.lcms}
${pcl.gsl}
- -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
+ -lpng -ljpeg -ltiff -lpopt -lz
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms
@@ -622,6 +633,7 @@
+
@@ -638,7 +650,8 @@
-
+
+
@@ -647,28 +660,31 @@
-
-
+
-
-
-
+
-
+
+
+
+
+
+
-
+
+
@@ -689,6 +705,8 @@
+
+
@@ -891,7 +909,6 @@
-