trivial changes to address warning with g++-4.2

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index 8a55b523b377e5ff378223571f6a5141932a81ac..f8a71ad91cf818ca6d639e6558ac83d504e66e93 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -53,8 +53,6 @@
 
 
 
-
-
   <!--
   ########################################################################
   ## T A R G E T    :    I N I T
@@ -62,7 +60,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 +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
 
@@ -144,6 +143,13 @@
         /* 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
 
         #endif /* _CONFIG_H_ */
     </makefile>
@@ -177,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"/>
@@ -256,6 +263,7 @@
             -DHAVE_CONFIG_H
             -DXP_WIN <!-- for JS -->
             -D_INTL_REDIRECT_INLINE
+            -DHAVE_SSL
             -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
         </defines>
         <includes>
@@ -282,6 +290,7 @@
             -I${gtk}/include/libxml2 
             -I${gtk}/include/freetype2
             -I${gtk}/include/cairo
+            -I${gtk}/include/poppler
             <!-- PERL -->
             -Wno-comment -I${gtk}/perl/lib/CORE
             <!-- PYTHON -->
@@ -350,6 +359,7 @@
               objcopycommand="${archutil}objcopy"
               >
        <flags>
+           -mwindows
        </flags>
        <fileset dir="${build}">
            <include name="inkres.o"/>
@@ -364,18 +374,24 @@
            -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
            ${gtk}/lib/iconv.lib
            -lfreetype.dll -lfontconfig.dll
-           -llcms.dll
            -lssl -lcrypto
-           -lpng -lpopt ${gtk}/lib/zdll.lib
-           -lgc -mwindows -lws2_32 -lintl -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>
     </link>
   </target>
@@ -424,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
@@ -477,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}"/>