X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=8a6c22a6a2cf47324b81f87f29d3453b7c6928bb;hb=713ffe6438216a16f37590dfcb78715b42906843;hp=c07d9b85ddc29328ae413893db2f1b4705961fa3;hpb=adb5b4bae27b11a3c7739614c44b0762a51dcdc0;p=inkscape.git

diff --git a/build.xml b/build.xml
index c07d9b85d..8a6c22a6a 100644
--- a/build.xml
+++ b/build.xml
@@ -42,16 +42,24 @@
 
   <!-- set global properties for this build -->
   <property name="version"     value="0.46dev"/>
-  <property name="arch"        value="i686-pc-mingw32-"/>
-  <!--<property name="archutil"    value="${arch}"/>-->
-  <property name="archutil"    value=""/>
   <property name="src"         location="src"/>
-  <property name="gtk"         location="c:/gtk210"/>
   <property name="lib"         location="lib"/>
   <property name="build"       location="build"/>
   <property name="dist"        location="inkscape"/>
 
+  <!-- Use these settings for the native compiler -->  
+  <!-- -->
+  <property name="arch"        value="mingw32-"/>
+  <property name="archutil"    value=""/>
+  <property name="gtk"         location="c:/devlibs"/>
+  <!-- -->
 
+  <!-- Use these settings for the cross compiler -->  
+  <!--
+  <property name="arch"        value="i686-pc-mingw32-"/>
+  <property name="archutil"    value="${arch}"/>
+  <property name="gtk"         location="/target"/>
+  -->
 
 
 
@@ -62,7 +70,7 @@
   -->
   <target name="init"
       description=
-      "Do all prepatory tasks, like make directories and copy files">
+      "Do all preparatory tasks, like make directories and copy files">
 
 
     <!-- example of the <pkg-config> task
@@ -121,6 +129,7 @@
         #define HAVE_MALLOC_H                 1
         #define HAVE_STDLIB_H                 1
         #define HAVE_SYS_STAT_H               1
+        #define HAVE_INTTYPES_H               1
 
         #define ENABLE_LCMS                   1
 
@@ -144,6 +153,16 @@
         /* shared whiteboard */
         #define WITH_INKBOARD                 1
         #define HAVE_SSL                      1
+        
+        /* use poppler for pdf import? */
+        #define HAVE_POPPLER                  1
+        #define HAVE_POPPLER_CAIRO            1
+
+        /* do we want bitmap manipulation? */
+        #define WITH_IMAGE_MAGICK             1
+
+        /* Allow reading WordPerfect? */
+        #define WITH_LIBWPG                   1
 
         #endif /* _CONFIG_H_ */
     </makefile>
@@ -177,6 +196,7 @@
              destdir="${build}/obj">
         <fileset dir="${src}">
             <!-- THINGS TO EXCLUDE -->
+            <exclude name="2geom/chebyshev.cpp"/>
             <exclude name="ast/.*"/>
             <exclude name="bonobo/.*"/>
             <exclude name="deptool.cpp"/>
@@ -240,7 +260,7 @@
             <exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
             <exclude name="jabber_whiteboard/node-tracker.cpp"/>
             <exclude name="jabber_whiteboard/node-utilities.cpp"/>
-            <!--WHITEBOARD-->
+            <!--OVERLAP-->
             <exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
             <exclude name="removeoverlap/placement_SolveVPSC.h"/>
             <exclude name="removeoverlap/test.cpp"/>
@@ -248,7 +268,8 @@
             <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
         </fileset>
         <flags>
-            -Wall -O3
+            -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+            -O3
             -mms-bitfields
         </flags>
         <defines>
@@ -283,6 +304,10 @@
             -I${gtk}/include/libxml2 
             -I${gtk}/include/freetype2
             -I${gtk}/include/cairo
+            -I${gtk}/include/poppler
+            -I${gtk}/include/gc
+            -I${gtk}/include/libwpg-0.1
+            -I${gtk}/include/libwpd-0.8
             <!-- PERL -->
             -Wno-comment -I${gtk}/perl/lib/CORE
             <!-- PYTHON -->
@@ -351,6 +376,7 @@
               objcopycommand="${archutil}objcopy"
               >
        <flags>
+           -mwindows
        </flags>
        <fileset dir="${build}">
            <include name="inkres.o"/>
@@ -365,18 +391,27 @@
            -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
            -lgdk_pixbuf-2.0
            -lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
-           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
+           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0
            <!-- PERL -->
            -L${gtk}/perl/lib/CORE -lperl58
            <!-- PYTHON -->
            -L${gtk}/python/libs -lpython25
            ${gtk}/bin/libxml2.dll
+           ${gtk}/bin/libxslt.dll
+           -lpoppler-cairo -lpoppler
+           -lcairo.dll
+           -lwpg-0.1.dll -lwpg-stream-0.1.dll
+           -lwpd-0.8.dll -lwpd-stream-0.8.dll
            ${gtk}/lib/iconv.lib
+           -lMagick++ -lWand -lMagick
            -lfreetype.dll -lfontconfig.dll
-           -llcms.dll
            -lssl -lcrypto
-           -lpng -lpopt ${gtk}/lib/zdll.lib
-           -lgc -mwindows -lws2_32 -lintl -lm
+           -llcms.dll
+           -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+           -lgc
+		   -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           <!-- 2geom -->
+           <!-- -l2geom -->
        </libs>
     </link>
   </target>
@@ -425,6 +460,7 @@
            <!-- PYTHON -->
            -L${gtk}/python/libs -lpython24
            ${gtk}/bin/libxml2.dll
+           ${gtk}/bin/libxslt.dll
            ${gtk}/lib/iconv.lib
            -lfreetype.dll -lfontconfig.dll
            -llcms.dll
@@ -471,6 +507,7 @@
     <copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libpoppler-2.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
@@ -478,8 +515,13 @@
     <copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/xmlparse.dll" tofile="${dist}/libexpat.dll"/>
+    <copy file="${gtk}/bin/libxslt.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libexpat.dll" todir="${dist}"/>
+    <!--<copy file="${gtk}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+    <copy file="${gtk}/bin/libwpg-0.1.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libwpg-stream-0.1.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libwpd-0.8.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
@@ -487,7 +529,7 @@
     <copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libpopt-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/intl.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
@@ -516,6 +558,10 @@
     <mkdir dir="${dist}/plugins"/>
     <copy file="${gtk}/bin/gdb.exe" todir="${dist}"/>
 
+    <!-- Necessary to run extensions on windows if it is not in the path -->
+    <copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
+    <copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
+
     <!-- PERL -->
     <copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>