X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=68a3162d9f83fd73bb733c0fccf0fe93a56c827a;hb=a95be1234ba4df33d6d074589edaa56f0d546069;hp=f723148ab6cf555a0164f5f5e83a81ced48ab424;hpb=0dc87acb09959412a4f74ab0625958f45e30e907;p=inkscape.git

diff --git a/build.xml b/build.xml
index f723148ab..68a3162d9 100644
--- a/build.xml
+++ b/build.xml
@@ -26,8 +26,6 @@
 
 
 
-
-
 <!--
 ########################################################################
 ## P R O J E C T   :   I N K S C A P E
@@ -38,6 +36,9 @@
         Build file for the Inkscape SVG editor.  This file
         was written for GTK-2.10 on Win32, but it should work
         well for other types of builds with only minor adjustments.
+        Note that the default target is 'dist'.  You can execute other
+        targets instead, by "btool {target}",  like  "btool compile", if
+        you want to save time.
     </description>
 
   <!-- set global properties for this build -->
@@ -378,8 +379,7 @@
        <libs>
            -L${gtk}/lib
            -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
-           ${pcl.gtkmm-2.4}  ${pc.pangoft2} -lgthread-2.0
-           -lgsl
+           ${pcl.gtkmm-2.4}  ${pcl.pangoft2} ${pcl.gthread-2.0}
            <!-- PERL -->
            <!-- -L${gtk}/perl/lib/CORE -lperl58 -->
            <!-- PYTHON -->
@@ -395,6 +395,7 @@
            -lfreetype.dll -lfontconfig.dll
            -lssl -lcrypto
            -llcms.dll
+           -lgsl
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
            -lgc
 		   -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
@@ -511,6 +512,8 @@
     <copy file="${gtk}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
+    <!-- GTK changed their dep file name for PNG!   :-(  -->
+    <copy file="${gtk}/bin/libpng13.dll" tofile="${dist}/libpng12-0.dll"/>
     <copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/msvcr70.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>
@@ -539,6 +542,7 @@
         </fileset>
     </copy>
     <copy todir="${dist}/share"> <fileset dir="${gtk}/share/themes"/> </copy>
+    <copy todir="${dist}/share"> <fileset dir="${gtk}/share/poppler"/> </copy>
     <mkdir dir="${dist}/data"/>
     <mkdir dir="${dist}/locale"/>
     <mkdir dir="${dist}/modules"/>