Update to gtk2.10

diff --git a/build.xml b/build.xml
index 00894d92f9c3c3b65b6e5b65bf40e558c6e22c8d..f40afe4f0dd8553c4feca60c59641a6686021f86 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -6,10 +6,10 @@
   <!-- set global properties for this build -->\r
   <property name="version"     location="0.45"/>\r
   <property name="src"         location="src"/>\r
-  <property name="gtk"         location="c:/gtk28"/>\r
+  <property name="gtk"         location="c:/gtk210"/>\r
   <property name="lib"         location="lib"/>\r
   <property name="build"       location="build"/>\r
-  <property name="dist"        location="dist"/>\r
+  <property name="dist"        location="inkscape"/>\r
 \r
   <target name="init">\r
     <!-- Create the build directory structure used by compile -->\r
@@ -85,7 +85,7 @@
                <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>\r
            </fileset>\r
         <flags>\r
-            -Wall -g -O3\r
+            -Wall -O3\r
                        -mms-bitfields\r
         </flags>\r
         <defines>\r
@@ -106,6 +106,7 @@
                    -I${gtk}/lib/gdkmm-2.4/include\r
             -I${gtk}/include/pangomm-1.4\r
             -I${gtk}/include/atkmm-1.6\r
+            -I${gtk}/include/cairomm-1.0\r
             -I${gtk}/include/sigc++-2.0\r
                    -I${gtk}/lib/sigc++-2.0/include\r
             -I${gtk}/include/gtk-2.0\r
@@ -180,9 +181,10 @@
            -lgc -mwindows -lws2_32 -lintl -lm\r
           </libs>\r
        </link>\r
+       <strip file="${build}/inkscape.exe"/>\r
   </target>\r
 \r
-  <target name="dist" depends="link"\r
+  <target name="dist" depends="link,i18n"\r
         description="generate the distribution" >\r
     <!-- Create the distribution directory -->\r
     <copy file="${build}/inkscape.exe" todir="${dist}"/>\r
@@ -197,6 +199,7 @@
     <copy file="${gtk}/bin/libgtkmm-2.4-1.dll" todir="${dist}"/>\r
     <copy file="${gtk}/bin/libgdkmm-2.4-1.dll" todir="${dist}"/>\r
     <copy file="${gtk}/bin/libpangomm-1.4-1.dll" todir="${dist}"/>\r
+    <copy file="${gtk}/bin/libcairomm-1.0-1.dll" todir="${dist}"/>\r
     <copy file="${gtk}/bin/libsigc-2.0-0.dll" todir="${dist}"/>\r
     <copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>\r
     <copy file="${gtk}/bin/libatk-1.0-0.dll" todir="${dist}"/>\r
@@ -226,6 +229,7 @@
     <copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>\r
     <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>\r
     <copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>\r
+    <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>\r
 \r
     <!-- MSGFMT files -->\r
     <copy todir="${dist}"> <fileset dir="${build}/po"/> </copy>\r