X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=407fa4ae1459bb5175ebb8a2ff13c8be421c881a;hb=e53de5bd49b2c47acad8390f29409739ff83da2c;hp=99e221e64662e95b705b4300d8c5fe57c50dcb02;hpb=3523fcf848e747c77c68fa15640ca9eeac34e9ec;p=inkscape.git
diff --git a/build.xml b/build.xml
old mode 100644
new mode 100755
index 99e221e64..407fa4ae1
--- 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
@@ -188,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
@@ -312,6 +314,7 @@
+
@@ -391,7 +394,8 @@
${pcc.gtkmm-2.4}
- -I${devlibs}/include/libxml2
+ ${pcc.Magick++}
+ ${pcc.libxml-2.0}
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
@@ -477,7 +481,7 @@
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
- -mconsole
+ -mwindows
-mthreads
@@ -495,13 +499,12 @@
${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
@@ -510,9 +513,26 @@
+
+
-
-
+
+
+ -mconsole
+ -mthreads
+
+
+
+
+
+
+
+
-
-
-
+
-
+
+
+
+
+
+
+
-
+
+
@@ -722,12 +746,12 @@
-
+
-
+
@@ -787,12 +811,13 @@
## T A R G E T : D I S T - I N K S C A P E
########################################################################
-->
-
+