trivial changes to address warning with g++-4.2

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index 7e152429d8c9e2c1bc24b8fada9da0ea08239bf8..f8a71ad91cf818ca6d639e6558ac83d504e66e93 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -50,7 +50,6 @@
   <property name="lib"         location="lib"/>
   <property name="build"       location="build"/>
   <property name="dist"        location="inkscape"/>
-  <property name="boost"         location="c:/boost"/>
 
 
 
@@ -120,6 +119,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
 
@@ -146,6 +146,10 @@
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
+        #define HAVE_POPPLER_CAIRO            1
+
+        /* do we want bitmap manipulation? */
+        #define WITH_IMAGE_MAGICK             1
 
         #endif /* _CONFIG_H_ */
     </makefile>
@@ -179,6 +183,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"/>
@@ -248,7 +253,6 @@
             <exclude name="removeoverlap/test.cpp"/>
             <exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
             <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
-            <exclude name="extension/internal/bitmap/.*"/>
         </fileset>
         <flags>
             -Wall -O3
@@ -291,9 +295,6 @@
             -Wno-comment -I${gtk}/perl/lib/CORE
             <!-- PYTHON -->
             -I${gtk}/python/include
-            <!-- 2geom -->
-            <!-- -I${gtk}/include/2geom -->
-            -I${boost}
         </includes>
     </cc>
   </target>
@@ -358,6 +359,7 @@
               objcopycommand="${archutil}objcopy"
               >
        <flags>
+           -mwindows
        </flags>
        <fileset dir="${build}">
            <include name="inkres.o"/>
@@ -372,19 +374,22 @@
            -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
-           -lpoppler
+           ${gtk}/bin/libxslt.dll
+           -lpoppler-cairo -lpoppler
+           -lcairo.dll
            ${gtk}/lib/iconv.lib
            -lfreetype.dll -lfontconfig.dll
-           -llcms.dll
            -lssl -lcrypto
-           -lpng -ljpeg.dll -lpopt ${gtk}/lib/zdll.lib
-           -lgc -mconsole -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           -lMagick++ -lWand -lMagick
+           -llcms.dll
+           -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+           -lgc -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
            <!-- 2geom -->
            <!-- -l2geom -->
        </libs>
@@ -435,6 +440,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
@@ -488,6 +494,7 @@
     <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/libxslt.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/jpeg62.dll" todir="${dist}"/>