summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2013-02-20 05:47:35 +0000
committerJazzyNico <nicoduf@yahoo.fr>2013-02-20 05:47:35 +0000
commitc67d16e0fbef7f8aaf3d238ee2ae3c9d810eb734 (patch)
tree5ed528ba984c61d879331257ace6377f28674bc2
parentcorrect wrong find package (diff)
downloadinkscape-c67d16e0fbef7f8aaf3d238ee2ae3c9d810eb734.tar.gz
inkscape-c67d16e0fbef7f8aaf3d238ee2ae3c9d810eb734.zip
Win32. Fix for Bug #1125620 (Crashes on trying to open document properties or preferences).
(bzr r12136)
-rw-r--r--build.xml9
1 files changed, 4 insertions, 5 deletions
diff --git a/build.xml b/build.xml
index 8b5163877..d287348d0 100644
--- a/build.xml
+++ b/build.xml
@@ -153,7 +153,7 @@
#define HAVE_OPENMP 1
#define HAVE_TR1_UNORDERED_SET 1
- #define HAVE_LIBLCMS1 1
+ #define HAVE_LIBLCMS2 1
#define WITH_GTKMM_2_24 1
@@ -487,7 +487,7 @@
-liconv
${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- ${pcl.lcms}
+ ${pcl.lcms2}
${pcl.gsl}
-lpng -ljpeg -ltiff -lexif -lpopt -lz
-lgc
@@ -559,7 +559,7 @@
-liconv
${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- ${pcl.lcms}
+ ${pcl.lcms2}
${pcl.gsl}
-lpng -ljpeg -ltiff -lexif -lpopt -lz
-lgc
@@ -609,7 +609,7 @@
-liconv
${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- ${pcl.lcms}
+ ${pcl.lcms2}
${pcl.gsl}
-lpng -ljpeg -ltiff -lexif -lpopt -lz
-lgc
@@ -690,7 +690,6 @@
<copy todir="${dist}" file="${devlibs}/bin/bzip2.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/iconv.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
- <copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/liblcms2-2.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libMagick++-3.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libMagickCore-3.dll"/>