diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
## P R O J E C T : I N K S C A P E
########################################################################
-->
-<project name="Inkscape" default="dist-inkscape" basedir=".">
+<project name="Inkscape" default="dist-all" basedir=".">
<description>
Build file for the Inkscape SVG editor. This file
was written for GTK-2.10 on Win32, but it should work
</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"/>
<!--makefile file="${src}/inkscape-version.cpp">
namespace Inkscape {
- char const *version_string = "${version} ${svn.revision}";
+ char const *version_string = "${version}";
}
</makefile-->
<makefile file="${src}/inkscape-version.cpp">
namespace Inkscape {
- char const *version_string = "${version}";
+ char const *version_string = "${version} ${bzr.revision}";
}
</makefile>
<makefile file="config.h">
#define ENABLE_SVG_FONTS 1
/* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
- #define LPE_ENABLE_TEST_EFFECTS 1
+ //#define LPE_ENABLE_TEST_EFFECTS 1
#define HAVE_ASPELL 1
<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"/>
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
<flags>
- -mconsole
+ -mwindows
-mthreads
</flags>
<fileset dir="${build}">
</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>
<!--
########################################################################
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
<flags>
- -mconsole
+ -mwindows
-mthreads
</flags>
<fileset dir="${build}">
<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>