X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=58e9fba3ea65f52e00a69f9ed026c38286fe4a1d;hb=314cde3be432c9ce1323e7ddc5d4327581358e90;hp=16443dfc2000f9a678bafdd391ed5628631cafd0;hpb=56f5cb721ff28938b4de51d0d4558531a0f0ed62;p=inkscape.git

diff --git a/build.xml b/build.xml
old mode 100644
new mode 100755
index 16443dfc2..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.
     </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"/>
@@ -53,7 +53,8 @@
   <property name="arch"          value="mingw32-"/>
   <property name="archutil"      value=""/>
   <property name="devlibs"       location="${env.DEVLIBS_PATH}"/>
-  <property name="mingw_bin"     location="${env.MINGW_BIN}"/>
+  <property name="mingw"         location="${env.MINGW_PATH}"/>
+  <property name="mingw_bin"     location="${env.MINGW_PATH}/bin"/>
   <property name="cxxtest"       location="cxxtest"/>
   <property name="python"        location="${devlibs}/python/python.exe"/>
   <!-- -->
@@ -101,9 +102,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}";
+        }
+    </makefile-->
     <makefile file="${src}/inkscape-version.cpp">
         namespace Inkscape {
-            char const *version_string = "${version} ${svn.revision}";
+            char const *version_string = "${version} ${bzr.revision}";
         }
     </makefile>
     <makefile file="config.h">
@@ -145,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
 
@@ -183,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
 
@@ -207,6 +214,7 @@
             <include name="color-profile-test.h"/>
             <include name="dir-util-test.h"/>
             <include name="extract-uri-test.h"/>
+            <include name="marker-test.h"/>
             <include name="mod360-test.h"/>
             <include name="preferences-test.h"/>
             <include name="round-test.h"/>
@@ -385,7 +393,8 @@
             <!-- GTK / GTKMM -->
             ${pcc.gtkmm-2.4}
             <!-- OTHER -->
-            -I${devlibs}/include/libxml2 
+			${pcc.Magick++}
+			${pcc.libxml-2.0}
             ${pcc.freetype2}
             ${pcc.cairo}
             ${pcc.poppler}
@@ -471,7 +480,6 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -489,13 +497,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
@@ -528,7 +535,6 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -544,13 +550,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
@@ -596,13 +601,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
@@ -629,6 +633,7 @@
     <copy todir="${dist}" file="TRANSLATORS"/>
     <copy todir="${dist}" file="${devlibs}/bin/libatkmm-1.6-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libglibmm-2.4-1.dll"/>
+	<copy todir="${dist}" file="${devlibs}/bin/libgiomm-2.4-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgtkmm-2.4-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgdkmm-2.4-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpangomm-1.4-1.dll"/>
@@ -645,7 +650,8 @@
     <copy todir="${dist}" file="${devlibs}/bin/libgthread-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgio-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libcairo-2.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libpoppler-3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpoppler-5.dll"/>
+	<copy todir="${dist}" file="${devlibs}/bin/libpoppler-glib-4.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpangocairo-1.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpango-1.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpangoft2-1.0-0.dll"/>
@@ -654,28 +660,31 @@
     <copy todir="${dist}" file="${devlibs}/bin/libfontconfig-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libxml2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libxslt.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libexpat.dll"/>
-    <!--<copy file="${devlibs}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+    <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpg-stream-0.1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.8.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.8.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/jpeg62.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libpng13.dll"/>
-    <!-- GTK changed their dep file name for PNG!   :-(  -->
+    <copy todir="${dist}" file="${devlibs}/bin/libjpeg-7.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpng12-0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libtiff3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libtiff-3.dll"/>
+	<copy todir="${dist}" file="${devlibs}/bin/libopenjpeg-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/zlib1.dll"/>
+	<copy todir="${dist}" file="${devlibs}/bin/bzip2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/iconv.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/>
+	<copy todir="${dist}" file="${devlibs}/bin/libMagick++-3.dll"/>
+	<copy todir="${dist}" file="${devlibs}/bin/libMagickCore-3.dll"/>
+	<copy todir="${dist}" file="${devlibs}/bin/libMagickWand-3.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/intl.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/pthreadGC2.dll"/>
     <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
-    <!-- MINGW dll needed, I think for openmp support  -->
+    <!-- MINGW support DLLs needed for openmp support  -->
     <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
+	<copy todir="${dist}" file="${mingw}/lib/gcc/mingw32/bin/libgomp-1.dll"/>
 
     <!-- MSGFMT files -->
     <copy todir="${dist}">