From 1c77922b3304a0f03b5b4cf97d2a652e9db95dfa Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sat, 9 Jan 2016 09:03:26 +0100
Subject: Updating libcdr (Corel Draw importer) version. Please use with
 devlibs>=r57.

(bzr r14567)
---
 build.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index de46d5684..1fea18685 100644
--- a/build.xml
+++ b/build.xml
@@ -200,7 +200,9 @@
 
         /* Corel Draw import filter */
         #define WITH_LIBCDR                   1
-
+        /* Librevenge based filter */
+        #define WITH_LIBCDR01                 1
+		
         /* Do we support SVG Fonts? */
         #define ENABLE_SVG_FONTS              1
 
@@ -404,7 +406,8 @@
             ${pcc.poppler}
             -I${devlibs}/include/gc
             -I${devlibs}/include/potracelib
-            ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.0}
+            ${pcc.librevenge-0.0} ${pcc.librevenge-stream-0.0}
+            ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.1}
             -I${cxxtest}
             <!-- PERL -->
             <!-- -Wno-comment -I${devlibs}/perl/lib/CORE -->
@@ -480,7 +483,8 @@
            ${devlibs}/bin/libxslt.dll
            ${devlibs}/bin/libexslt.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-0.0} ${pcl.librevenge-stream-0.0}
+           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.1}
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
@@ -562,7 +566,8 @@
            ${devlibs}/bin/libxslt.dll
            ${devlibs}/bin/libexslt.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-0.0} ${pcl.librevenge-stream-0.0}
+           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.1}
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
@@ -612,7 +617,8 @@
            ${devlibs}/bin/libxslt.dll
            ${devlibs}/bin/libexslt.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-0.0} ${pcl.librevenge-stream-0.0}
+           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.1}
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
@@ -675,11 +681,13 @@
     <copy todir="${dist}" file="${devlibs}/bin/libxslt.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libexslt.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/librevenge-0.0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/librevenge-stream-0.0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.9.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.9.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libvisio-0.0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libcdr-0.0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libcdr-0.1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/icui18n50.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/icudata50.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/icuuc50.dll"/>
-- 
cgit v1.2.3