diff --git a/build-lx.xml b/build-lx.xml
index d90d9952d43402244f0fa3c60971d6166b85713d..4f81783efcfb654879a6fbdc9fc0195b4e11f910 100644 (file)
--- a/build-lx.xml
+++ b/build-lx.xml
</description>
<!-- set global properties for this build -->
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.46+devel"/>
+ <property name="version" value="0.48+devel"/>
<property name="src" location="src"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<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="inkscape_version.h">
<copy file="${src}/helper/sp-marshal.cpp.mingw"
tofile="${src}/helper/sp-marshal.cpp"/>
<makefile file="inkscape_version.h">
- #define INKSCAPE_VERSION "${version}"
+ #define INKSCAPE_VERSION "${version}, revision ${svn.revision}"
</makefile>
<makefile file="config.h">
#ifndef _CONFIG_H_
</makefile>
<makefile file="config.h">
#ifndef _CONFIG_H_
#define WITH_PYTHON 1
/* shared whiteboard */
#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
/* use poppler for pdf import? */
#define HAVE_POPPLER 1
########################################################################
-->
<target name="touchabout"
########################################################################
-->
<target name="touchabout"
- description="update the modification time of aboutdialog.cpp">
- <!-- not good <touch file="${src}/ui/dialog/aboutdialog.cpp"/> -->
+ description="update the modification time of aboutbox.cpp">
+ <!-- not good <touch file="${src}/ui/dialog/aboutbox.cpp"/> -->
<!-- better -->
<!-- better -->
- <delete file="${build}/obj/ui/dialog/aboutdialog.o"/>
+ <delete file="${build}/obj/ui/dialog/aboutbox.o"/>
+ <delete file="inkscape_version.h"/>
</target>
</target>
<!-- Compile from source to build -->
<cc cc="${arch}gcc" cxx="${arch}g++"
destdir="${build}/obj"
<!-- Compile from source to build -->
<cc cc="${arch}gcc" cxx="${arch}g++"
destdir="${build}/obj"
- continueOnError="false"
- refreshCache="${refresh}">
+ continueOnError="false"
+ refreshCache="${refresh}">
<fileset dir="${src}">
<!-- THINGS TO EXCLUDE -->
<exclude name="2geom/chebyshev.cpp"/>
<fileset dir="${src}">
<!-- THINGS TO EXCLUDE -->
<exclude name="2geom/chebyshev.cpp"/>
<exclude name="svg/ftos.cpp"/>
<exclude name="svg/test-svg.cpp"/>
<exclude name="svg/test-svg-main.cpp"/>
<exclude name="svg/ftos.cpp"/>
<exclude name="svg/test-svg.cpp"/>
<exclude name="svg/test-svg-main.cpp"/>
- <exclude name="utest/.*"/>
<exclude name="widgets/test-widgets.cpp"/>
<exclude name="xml/quote-test.cpp"/>
<exclude name="xml/repr-action-test.cpp"/>
<exclude name="widgets/test-widgets.cpp"/>
<exclude name="xml/quote-test.cpp"/>
<exclude name="xml/repr-action-test.cpp"/>
</excludeinc>
<flags>
-Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
</excludeinc>
<flags>
-Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
- -O2 -g
+ -O2
</flags>
<defines>
-DVERSION=\"${version}\"
</flags>
<defines>
-DVERSION=\"${version}\"
<!-- GTK / GTKMM -->
${pcc.gtkmm-2.4}
<!-- OTHER -->
<!-- GTK / GTKMM -->
${pcc.gtkmm-2.4}
<!-- OTHER -->
- -I${devlibs}/include/libxml2
+ ${pcc.libxslt}
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
-I${devlibs}/include/gc
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
-I${devlibs}/include/gc
- -I${devlibs}/include/libwpg-0.1
- -I${devlibs}/include/libwpd-0.8
- <!-- PERL -->
- <!-- -Wno-comment -I${devlibs}/perl/lib/CORE -->
+ ${pcc.libwpg-0.1} ${pcc.libwpg-stream-0.1}
<!-- PYTHON -->
-I${devlibs}/python/include
<!-- JAVA -->
<!-- PYTHON -->
-I${devlibs}/python/include
<!-- JAVA -->
${pcl.gtkmm-2.4}
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.gthread-2.0}
${pcl.gtkmm-2.4}
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.gthread-2.0}
- -lxml2 -lxslt
- -lwpg-0.1 -lwpg-stream-0.1
+ ${pcl.libxslt}
+ ${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
${pcl.ImageMagick++}
${pcl.fontconfig} ${pcl.freetype2}
${pcl.lcms}
${pcl.gsl}
-lssl -lcrypto
-lpng -ljpeg -ltiff -lpopt -lz
${pcl.ImageMagick++}
${pcl.fontconfig} ${pcl.freetype2}
${pcl.lcms}
${pcl.gsl}
-lssl -lcrypto
-lpng -ljpeg -ltiff -lpopt -lz
- -lgc
- -lm
- <!-- 2geom -->
- <!-- -l2geom -->
+ -lgc -lm
</libs>
</link>
</target>
</libs>
</link>
</target>
-lssl -lcrypto
-lpng -ljpeg -ltiff -lpopt -lz
-lgc
-lssl -lcrypto
-lpng -ljpeg -ltiff -lpopt -lz
-lgc
- -lintl -liconv -lm
+ -lintl -liconv -lm
</libs>
</link>
</target>
</libs>
</link>
</target>
<delete dir="${dist}"/>
<delete file="build.dep"/>
<delete file="config.h"/>
<delete dir="${dist}"/>
<delete file="build.dep"/>
<delete file="config.h"/>
+ <delete file="inkscape_version.h"/>
</target>
</target>