gobble motion events when dragging selection - looks like with recent gtk, this does...

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index bd798ea685fe236e26bf0e33c0acbc027a0bd620..8280b32305a970c2b80df257a8a8c8c731ea6591 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -53,8 +53,6 @@
 
 
 
-
-
   <!--
   ########################################################################
   ## T A R G E T    :    I N I T
@@ -147,6 +145,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>
@@ -355,6 +357,7 @@
               objcopycommand="${archutil}objcopy"
               >
        <flags>
+           -mwindows
        </flags>
        <fileset dir="${build}">
            <include name="inkres.o"/>
@@ -369,19 +372,23 @@
            -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
+           -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 -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>