diff --git a/build.xml b/build.xml
index 384251fc6796aa1530483864b9d213fc508de722..d8c62e5f27333eb7485c32b7e29e3f4ad7c293c0 100644 (file)
--- a/build.xml
+++ b/build.xml
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.46+devel"/>
+ <property name="version" value="0.47+devel"/>
<property name="src" location="src"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<copy file="${src}/helper/sp-marshal.cpp.mingw"
tofile="${src}/helper/sp-marshal.cpp"/>
- <makefile file="${src}/inkscape-version.cpp">
+ <!--makefile file="${src}/inkscape-version.cpp">
namespace Inkscape {
char const *version_string = "${version} ${svn.revision}";
}
+ </makefile-->
+ <makefile file="${src}/inkscape-version.cpp">
+ namespace Inkscape {
+ char const *version_string = "${version}";
+ }
</makefile>
<makefile file="config.h">
#ifndef _CONFIG_H_
#define WITH_PYTHON 1
/* shared whiteboard */
- #define WITH_INKBOARD 1
- #define HAVE_SSL 1
+ #undef WITH_INKBOARD
+ #undef HAVE_SSL
/* use poppler for pdf import? */
#define HAVE_POPPLER 1
#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
<include name="color-profile-test.h"/>
<include name="dir-util-test.h"/>
<include name="extract-uri-test.h"/>
+ <include name="marker-test.h"/>
<include name="mod360-test.h"/>
<include name="preferences-test.h"/>
<include name="round-test.h"/>
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
<flags>
- -mwindows
+ -mconsole
-mthreads
</flags>
<fileset dir="${build}">
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
<flags>
- -mwindows
+ -mconsole
-mthreads
</flags>
<fileset dir="${build}">
-lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
-lmscms <!-- required for color profiles -->
</libs>
</link>
-lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
-lmscms <!-- required for color profiles -->
</libs>
</link>