add cairomm to win32 linker proccess

diff --git a/build.xml b/build.xml
index 292a0aef10b80d81dc54dee4e2a8321e30f04f10..2f62b75e612ba8b53fc95b6b3b5f07f2cc53cdf9 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -268,7 +268,7 @@
         </fileset>
         <flags>
             -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
-            -O3
+            -O2
             -mms-bitfields
         </flags>
         <defines>
@@ -373,7 +373,7 @@
               strip="true" symfile="${build}/inkscape.dbg"
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy"
-              >
+                         >
        <flags>
            -mwindows
        </flags>
@@ -386,7 +386,7 @@
        <libs>
            -L${gtk}/lib
            -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
-           -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
+           -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4 
            -latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
            -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
            -lgdk_pixbuf-2.0
@@ -399,7 +399,8 @@
            ${gtk}/bin/libxml2.dll
            ${gtk}/bin/libxslt.dll
            -lcairo.dll
-           -lwpg-0.1.dll -lwpg-stream-0.1.dll
+           -lcairomm-1.0.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
@@ -453,7 +454,7 @@
            -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 -lcairo -lcairomm-1.0
            <!-- PERL -->
            -L${gtk}/perl/lib/CORE -lperl58
            <!-- PYTHON -->
@@ -461,6 +462,8 @@
            ${gtk}/bin/libxml2.dll
            ${gtk}/bin/libxslt.dll
            ${gtk}/lib/iconv.lib
+                  -lcairo.dll
+                  -lcairomm-1.0.dll
            -lfreetype.dll -lfontconfig.dll
            -llcms.dll
            -lssl -lcrypto
@@ -482,7 +485,7 @@
 
     <!-- Create the distribution directory -->
     <copy file="${build}/inkscape.exe" todir="${dist}"/>
-    <copy file="${build}/inkscape.dbg" todir="${dist}"/>
+       <copy file="${build}/inkscape.dbg" todir="${dist}"/>
     <copy file="AUTHORS" todir="${dist}"/>
     <copy file="COPYING" todir="${dist}"/>
     <copy file="COPYING.LIB" todir="${dist}"/>