contrib: fix harfbuzz linking flags on win32

ec8004ae · Rafaël Carré · 87c56df7 · ec8004ae · ec8004ae
Commit ec8004ae authored Sep 13, 2012 by Rafaël Carré
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

contrib/src/harfbuzz/rules.mak contrib/src/harfbuzz/rules.mak +3 -0

contrib/src/harfbuzz/win32.patch contrib/src/harfbuzz/win32.patch +9 -0

No files found.
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -14,6 +14,9 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:

 harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(UNPACK)
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/harfbuzz/win32.patch
+endif
 ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-osx.patch
 endif

--- a/contrib/src/harfbuzz/win32.patch
+++ b/contrib/src/harfbuzz/win32.patch
+--- harfbuzz/harfbuzz.pc.in.orig	2012-09-13 16:21:46.883843416 +0200
+++ harfbuzz/harfbuzz.pc.in	2012-09-13 16:21:54.771843345 +0200
+@@ -7,5 +7,5 @@
+ Description: Text shaping library
+ Version: @VERSION@
+ 
+-Libs: -L${libdir} -lharfbuzz
+Libs: -L${libdir} -lharfbuzz -lusp10 -lgdi32
+ Cflags: -I${includedir}/harfbuzz