summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2015-12-27 18:29:13 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2015-12-27 18:29:13 +0000
commite25a7f7561dc03bf81bb61d44ebdb324f004268e (patch)
tree8ee1cf8055efd7761d84879d219a4a0fb95df6ea
parentRemove superfluous glibmm/threads.h checks (diff)
downloadinkscape-e25a7f7561dc03bf81bb61d44ebdb324f004268e.tar.gz
inkscape-e25a7f7561dc03bf81bb61d44ebdb324f004268e.zip
Revert hard Harfbuzz dependency for Windows. Not yet in Devlibs.
(bzr r14551)
-rw-r--r--build-x64.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/build-x64.xml b/build-x64.xml
index d9d774b5c..76b2a467f 100644
--- a/build-x64.xml
+++ b/build-x64.xml
@@ -403,7 +403,6 @@
<!-- OTHER -->
${pcc.Magick++}
${pcc.libxml-2.0}
- ${ppc.harfbuzz}
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
@@ -479,7 +478,7 @@
<libs>
-L${devlibs}/lib
${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler}
- ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${harfbuzz} ${pcl.gthread-2.0}
+ ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0}
${devlibs}/bin/libxml2-2.dll
${devlibs}/bin/libxslt-1.dll
${devlibs}/bin/libexslt-0.dll
@@ -567,7 +566,7 @@
<libs>
-L${devlibs}/lib
${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler}
- ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${harfbuzz} ${pcl.gthread-2.0}
+ ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0}
${devlibs}/bin/libxml2-2.dll
${devlibs}/bin/libxslt-1.dll
${devlibs}/bin/libexslt-0.dll
@@ -623,7 +622,7 @@
<libs>
-L${devlibs}/lib
${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler}
- ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${harfbuzz} ${pcl.gthread-2.0}
+ ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0}
${devlibs}/bin/libxml2-2.dll
${devlibs}/bin/libxslt-1.dll
${devlibs}/bin/libexslt-0.dll