X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build28.xml;h=f0bff1ce22c8ad127c63b49aad3f997b1353b234;hb=0dd12485e26b98c7eb9963768ec4bd9869186d98;hp=fcae72ee9607bd972fecc6bdeab6c4776a2575c0;hpb=be7b0d5f126473157a9fe026e7a9fd54ee4b27c5;p=inkscape.git

diff --git a/build28.xml b/build28.xml
index fcae72ee9..f0bff1ce2 100644
--- a/build28.xml
+++ b/build28.xml
@@ -23,21 +23,21 @@
     <cc cc="gcc" cxx="g++" destdir="${build}/obj">
 	    <fileset dir="${src}">
             <!-- THINGS TO EXCLUDE -->
-	        <exclude name="ast"/>
-	        <exclude name="bonobo"/>
+	        <exclude name="ast/.*"/>
+	        <exclude name="bonobo/.*"/>
 	        <exclude name="deptool.cpp"/>
 	        <exclude name="dialogs/filedialog-win32.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/work/.*"/>
 	        <exclude name="dom/odf/SvgOdg.cpp"/>
 	        <exclude name="extension/api.cpp"/>
-	        <exclude name="extension/dxf2svg"/>
+	        <exclude name="extension/dxf2svg/.*"/>
 	        <exclude name="extension/internal/gnome.cpp"/>
 	        <exclude name="extension/script/bindtest.cpp"/>
 	        <exclude name="extension/script/cpptest.cpp"/>
-	        <exclude name="extension/plugin"/>
+	        <exclude name="extension/plugin/.*"/>
 	        <exclude name="extract-uri-test.cpp"/>
 	        <exclude name="helper/units-test.cpp"/>
 	        <exclude name="inkview.cpp"/>
@@ -57,7 +57,7 @@
 	        <exclude name="round-test.cpp"/>
 	        <exclude name="sp-gradient-test.cpp"/>
 	        <exclude name="svg/ftos.cpp"/>
-	        <exclude name="utest"/>
+	        <exclude name="utest/.*"/>
 	        <exclude name="widgets/test-widgets.cpp"/>
 	        <exclude name="xml/quote-test.cpp"/>
 	        <exclude name="xml/repr-action-test.cpp"/>
@@ -65,7 +65,7 @@
             <!--JABBER-->
 	        <exclude name="pedro/pedrogui.cpp"/>
 	        <exclude name="pedro/pedrogui.h"/>
-	        <exclude name="pedro/work"/>
+	        <exclude name="pedro/work/.*"/>
             <!--WHITEBOARD-->
 	        <exclude name="ui/dialog/session-player.cpp"/>
 	        <exclude name="ui/dialog/whiteboard-connect.cpp"/>
@@ -93,6 +93,7 @@
             -DHAVE_CONFIG_H
             -DXP_WIN <!-- for JS -->
 			-D_INTL_REDIRECT_INLINE
+            -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
             -DWITH_INKBOARD -DHAVE_SSL <!-- inkboard -->
         </defines>
         <includes>
@@ -127,12 +128,12 @@
   </target>
   
   <target name="lib" depends="compile">
-    <ar file="${build}/libinkscape.a">
+    <staticlib file="${build}/libinkscape.a">
 	   <fileset dir="${build}/obj">
 	       <exclude name="main,o"/>
 	       <exclude name="winmain,o"/>
 	   </fileset>
-	</ar>
+	</staticlib>
   </target>
 
   <target name="i18n" depends="compile">
@@ -183,7 +184,7 @@
 	<strip file="${build}/inkscape.exe"/>
   </target>
 
-  <target name="dist" depends="link"
+  <target name="dist" depends="link,i18n"
         description="generate the distribution" >
     <!-- Create the distribution directory -->
     <copy file="${build}/inkscape.exe" todir="${dist}"/>
@@ -207,7 +208,7 @@
     <copy file="${gtk}/bin/libgmodule-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libgobject-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgthread-2.0-0.dlll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>