X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=2c00661fa2b30f3b939028062b5d81e385f3230b;hb=ea55869971330306b308c104a7c1780119bb4b0e;hp=a8abf26c41142f44bd50720163793437788a9009;hpb=672b20e9f943d2108b991d79047cf4842ec819bc;p=inkscape.git
diff --git a/build.xml b/build.xml
old mode 100644
new mode 100755
index a8abf26c4..2c00661fa
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@
-
+
@@ -53,7 +53,8 @@
-
+
+
@@ -103,12 +104,12 @@
namespace Inkscape {
- char const *version_string = "${version}";
+ char const *version_string = "${version} ${bzr.revision}";
}
@@ -150,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
@@ -176,6 +178,7 @@
/* use poppler for pdf import? */
#define HAVE_POPPLER 1
+ #define HAVE_POPPLER_GLIB 1
#define HAVE_POPPLER_CAIRO 1
/* do we want bitmap manipulation? */
@@ -188,7 +191,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
@@ -312,6 +315,7 @@
+
@@ -391,7 +395,8 @@
${pcc.gtkmm-2.4}
- -I${devlibs}/include/libxml2
+ ${pcc.Magick++}
+ ${pcc.libxml-2.0}
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
@@ -477,7 +482,7 @@
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
- -mconsole
+ -mwindows
-mthreads
@@ -496,12 +501,11 @@
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
-liconv
- ${pcl.ImageMagick++}
+ ${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
@@ -510,9 +514,26 @@
+
+
-
-
+
+
+ -mconsole
+ -mthreads
+
+
+
+
+
+
+
+
-
-
-
+
-
+
+
+
+
+
+
+
-
+
+
@@ -722,12 +747,12 @@
-
+
-
+
@@ -787,12 +812,13 @@
## T A R G E T : D I S T - I N K S C A P E
########################################################################
-->
-
+