X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build-lx.xml;h=4f81783efcfb654879a6fbdc9fc0195b4e11f910;hb=b9f70c608ace2b2a0264ed04d08e8d3c7afe7fb0;hp=d90d9952d43402244f0fa3c60971d6166b85713d;hpb=1a810fc46c76940801e780efa03698b3b9c81182;p=inkscape.git
diff --git a/build-lx.xml b/build-lx.xml
index d90d9952d..4f81783ef 100644
--- a/build-lx.xml
+++ b/build-lx.xml
@@ -39,7 +39,7 @@
-
+
@@ -102,7 +102,7 @@
- #define INKSCAPE_VERSION "${version}"
+ #define INKSCAPE_VERSION "${version}, revision ${svn.revision}"
#ifndef _CONFIG_H_
@@ -160,8 +160,8 @@
#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
@@ -185,10 +185,11 @@
########################################################################
-->
-
+ description="update the modification time of aboutbox.cpp">
+
-
+
+
@@ -203,8 +204,8 @@
+ continueOnError="false"
+ refreshCache="${refresh}">
@@ -246,7 +247,6 @@
-
@@ -284,7 +284,7 @@
-Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
- -O2 -g
+ -O2
-DVERSION=\"${version}\"
@@ -298,15 +298,12 @@
${pcc.gtkmm-2.4}
- -I${devlibs}/include/libxml2
+ ${pcc.libxslt}
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
-I${devlibs}/include/gc
- -I${devlibs}/include/libwpg-0.1
- -I${devlibs}/include/libwpd-0.8
-
-
+ ${pcc.libwpg-0.1} ${pcc.libwpg-stream-0.1}
-I${devlibs}/python/include
@@ -378,18 +375,15 @@
${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
- -lgc
- -lm
-
-
+ -lgc -lm
@@ -433,7 +427,7 @@
-lssl -lcrypto
-lpng -ljpeg -ltiff -lpopt -lz
-lgc
- -lintl -liconv -lm
+ -lintl -liconv -lm
@@ -589,6 +583,7 @@
+