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

diff --git a/build.xml b/build.xml
index 8d032e22c..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,10 +36,12 @@
         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 -->
-  <property environment="env"/>
   <property name="version"       value="0.46+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
@@ -65,6 +65,14 @@
   <!-- Extra properties -->  
   <property name="refresh"       value="false"/>
 
+  <!--
+    This is for package-config.  With these two settings, pkg-config
+    queries can be as simple as ${pcc.packageName} for cflags, and
+    ${pcl.packageName} for libs.  Dependencies are calculated automatically.
+  -->
+  <property name="pkg-config-path"   location="${gtk}/lib/pkgconfig"/>
+  <property name="pkg-config-prefix" location="${gtk}"/>
+
 
   <!--
   ########################################################################
@@ -76,16 +84,6 @@
       "Do all preparatory tasks, like make directories and copy files">
 
 
-    <!-- example of the <pkg-config> task
-      query can be cflags, libs, or both
-      prefix overrides the value of prefix="" in the file
-      the result of this entry can be later used as ${gtkmm}
-    -->
-    <!--
-    <pkg-config name="gtkmm-2.4" path="${gtk}/lib/pkgconfig"
-                query="both" property="gtkmm" prefix="${gtk}"/>
-    -->
-
     <mkdir dir="${build}"/>
     <mkdir dir="${build}/java"/>
     <mkdir dir="${build}/java/classes"/>
@@ -202,7 +200,7 @@
     <!-- Compile from source to build -->
     <cc cc="${arch}gcc" cxx="${arch}g++"
              destdir="${build}/obj"
-			 continueOnError="false"
+			 continueOnError="true"
 			 refreshCache="${refresh}">
         <fileset dir="${src}">
             <!-- THINGS TO EXCLUDE -->
@@ -213,7 +211,6 @@
             <exclude name="test-all.cpp"/>
             <exclude name="display/testnr.cpp"/>
             <exclude name="display/bezier-utils-test.cpp"/>
-            <exclude name="dom/jsdombind.cpp"/>
             <exclude name="dom/work/.*"/>
             <exclude name="dom/odf/SvgOdg.cpp"/>
             <exclude name="extension/api.cpp"/>
@@ -286,7 +283,6 @@
         <defines>
             -DVERSION=\"${version}\"
             -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 -->
@@ -294,23 +290,7 @@
         <includes>
             -I${gtk}/include
             <!-- GTK / GTKMM -->
-            -I${gtk}/include/glibmm-2.4
-            -I${gtk}/lib/glibmm-2.4/include
-            -I${gtk}/include/gtkmm-2.4
-            -I${gtk}/lib/gtkmm-2.4/include
-            -I${gtk}/include/gdkmm-2.4
-            -I${gtk}/lib/gdkmm-2.4/include
-            -I${gtk}/include/pangomm-1.4
-            -I${gtk}/include/atkmm-1.6
-            -I${gtk}/include/cairomm-1.0
-            -I${gtk}/include/sigc++-2.0
-            -I${gtk}/lib/sigc++-2.0/include
-            -I${gtk}/include/gtk-2.0
-            -I${gtk}/lib/gtk-2.0/include
-            -I${gtk}/include/atk-1.0
-            -I${gtk}/include/pango-1.0
-            -I${gtk}/include/glib-2.0
-            -I${gtk}/lib/glib-2.0/include
+            ${pcc.gtkmm-2.4}
             <!-- OTHER -->
             -I${gtk}/include/libxml2 
             -I${gtk}/include/freetype2
@@ -335,7 +315,6 @@
   ## T A R G E T    :    L I B
   ########################################################################
   -->
-  <!-- set depends to "compile,java" if you want to test that -->
   <target name="lib" depends="compile"
       description="create a static library">
     <staticlib command="${archutil}ar crsv"
@@ -400,16 +379,11 @@
        <libs>
            -L${gtk}/lib
            -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
-           -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
-           -lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
-           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0
+           ${pcl.gtkmm-2.4}  ${pcl.pangoft2} ${pcl.gthread-2.0}
            <!-- PERL -->
-           -L${gtk}/perl/lib/CORE -lperl58
+           <!-- -L${gtk}/perl/lib/CORE -lperl58 -->
            <!-- PYTHON -->
-           -L${gtk}/python/libs -lpython25
+           <!-- -L${gtk}/python/libs -lpython25 -->
            ${gtk}/bin/libxml2.dll
            ${gtk}/bin/libxslt.dll
            -lcairo.dll
@@ -421,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
@@ -463,12 +438,7 @@
        <libs>
            -L${gtk}/lib
            -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
-           -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
-           -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 -lcairomm-1.0
+           ${pcl.gtkmm-2.4}
            <!-- PERL -->
            -L${gtk}/perl/lib/CORE -lperl58
            <!-- PYTHON -->
@@ -542,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}"/>
@@ -570,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"/>