Text alignment is now taken into account when snapping a text object

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index 62eda3aaaa577c172e38c5687707ff4f4f6a518d..2606a3210a8a39a5eb4b982361c10d365d94f127 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.46+devel"/>
+  <property name="version"       value="0.47+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>
@@ -101,9 +101,14 @@
     <copy file="${src}/helper/sp-marshal.cpp.mingw"
           tofile="${src}/helper/sp-marshal.cpp"/>
           
+    <!--makefile file="${src}/inkscape-version.cpp">
+        namespace Inkscape {
+            char const *version_string = "${version} ${svn.revision}";
+        }
+    </makefile-->
     <makefile file="${src}/inkscape-version.cpp">
         namespace Inkscape {
-            char const *version_string = "${version} r${svn.revision}";
+            char const *version_string = "${version}";
         }
     </makefile>
     <makefile file="config.h">
@@ -166,8 +171,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
@@ -183,7 +188,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
 
@@ -298,6 +303,7 @@
             <exclude name="ast/.*"/>
             <exclude name="bonobo/.*"/>
             <exclude name="deptool.cpp"/>
+            <exclude name="cxxtests.cpp"/>
             <!--<exclude name="test-main.cpp"/>-->
             <!--<exclude name="test-src.cpp"/>-->
             <exclude name="display/test-display.cpp"/>
@@ -470,7 +476,7 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
+           -mconsole
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -498,6 +504,7 @@
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
            -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -526,7 +533,7 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
+           -mconsole
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -551,7 +558,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -602,7 +610,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2 
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -896,7 +905,6 @@
     <delete file="build.dep"/>
     <delete file="config.h"/>
     <delete file="${src}/inkscape-version.cpp"/>
-
     <delete file="${src}/test-main.cpp"/>
     <delete file="${src}/test-src.cpp"/>
     <delete file="${src}/display/test-display.cpp"/>