X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=2c00661fa2b30f3b939028062b5d81e385f3230b;hb=ea55869971330306b308c104a7c1780119bb4b0e;hp=a6e5be9805dafb295bcda01ac63ca29c6f38d5af;hpb=725a0babbf83444a957de29831c3fd818ed59338;p=inkscape.git
diff --git a/build.xml b/build.xml
old mode 100644
new mode 100755
index a6e5be980..2c00661fa
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@
-
+
@@ -104,12 +104,12 @@
namespace Inkscape {
- char const *version_string = "${version}";
+ char const *version_string = "${version} ${bzr.revision}";
}
@@ -151,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
@@ -177,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? */
@@ -189,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
@@ -313,6 +315,7 @@
+
@@ -479,7 +482,7 @@
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
- -mconsole
+ -mwindows
-mthreads
@@ -511,9 +514,26 @@
+
+
-
-
+
+
+ -mconsole
+ -mthreads
+
+
+
+
+
+
+
-
+
-
+
@@ -791,12 +812,13 @@
## T A R G E T : D I S T - I N K S C A P E
########################################################################
-->
-
+