diff --git a/build.xml b/build.xml
index 69a80008248de78c8eb8f7a8d4ba4b61e86e0048..2c00661fa2b30f3b939028062b5d81e385f3230b 100755 (executable)
--- a/build.xml
+++ b/build.xml
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.47+devel"/>
+ <property name="version" value="0.48+devel"/>
<property name="src" location="src"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
/* use poppler for pdf import? */
#define HAVE_POPPLER 1
+ #define HAVE_POPPLER_GLIB 1
#define HAVE_POPPLER_CAIRO 1
/* do we want bitmap manipulation? */
<exclude name="dom/work/.*"/>
<exclude name="dom/odf/SvgOdg.cpp"/>
<exclude name="extension/api.cpp"/>
+ <exclude name="extension/dbus/.*"/>
<exclude name="extension/dxf2svg/.*"/>
<exclude name="extension/implementation/plugin.cpp"/>
<exclude name="extension/script/bindtest.cpp"/>
</link>
</target>
+<!--
+ ########################################################################
+ ## T A R G E T : L I N K C O N S O L E
+ ########################################################################
+ -->
+ <target name="linkconsole" depends="compile"
+ description="link console helper">
-
-
+ <link command="${arch}g++" out="${build}/inkscape-console.exe"
+ strip="true" stripcommand="${archutil}strip">
+ <flags>
+ -mconsole
+ -mthreads
+ </flags>
+ <fileset dir="${build}">
+ <include name="obj/winconsole.o"/>
+ </fileset>
+ <libs></libs>
+ </link>
+ </target>
<!--
########################################################################
<copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.8.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libjpeg-7.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpng12-0.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libpng14-14.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libtiff-3.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libopenjpeg-2.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/>
<copy todir="${dist}" file="${devlibs}/perl/bin/perl58.dll"/>
<!-- PYTHON -->
- <copy todir="${dist}" file="${devlibs}/python/python25.dll"/>
+ <copy todir="${dist}" file="${devlibs}/python/python26.dll"/>
<copy todir="${dist}/python" file="${devlibs}/python/python.exe" />
<copy todir="${dist}/python" file="${devlibs}/python/pythonw.exe"/>
<copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Lib"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${devlibs}/python/DLLs"/> </copy>
- <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Scripts"/> </copy>
+ <!-- <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Scripts"/> </copy> -->
<!--<copy file="${devlibs}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
<makefile file="${dist}/etc/gtk-2.0/gtkrc">
## T A R G E T : D I S T - I N K S C A P E
########################################################################
-->
- <target name="dist-inkscape" depends="link,distbase"
+ <target name="dist-inkscape" depends="link,linkconsole,distbase"
description="copy inkscape to the distribution directory">
<!-- Create the distribution directory -->
<copy todir="${dist}" file="${build}/inkscape.exe"/>
<copy todir="${dist}" file="${build}/inkscape.dbg"/>
+ <copy file="${build}/inkscape-console.exe" tofile="${dist}/inkscape.com"/>
</target>