trivial changes to address warning with g++-4.2

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index 342e2b27dbf8ca43cbfec20765aaaee4ee13eea1..f8a71ad91cf818ca6d639e6558ac83d504e66e93 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -119,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
 
@@ -145,7 +146,8 @@
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
-        
+        #define HAVE_POPPLER_CAIRO            1
+
         /* do we want bitmap manipulation? */
         #define WITH_IMAGE_MAGICK             1
 
@@ -181,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"/>
@@ -371,13 +374,15 @@
            -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.dll
+           -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
            -lssl -lcrypto
@@ -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}"/>