[vlc-commits] contrib: fix harfbuzz linking flags on win32

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Sep 13 16:23:10 2012 +0200| [ec8004ae9f49da66c38b62aeee277170b064990c] | committer: Rafaël Carré

contrib: fix harfbuzz linking flags on win32

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ec8004ae9f49da66c38b62aeee277170b064990c
---

 contrib/src/harfbuzz/rules.mak   |    3 +++
 contrib/src/harfbuzz/win32.patch |    9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 0973b13..6b35342 100644
--- 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
diff --git a/contrib/src/harfbuzz/win32.patch b/contrib/src/harfbuzz/win32.patch
new file mode 100644
index 0000000..4b49fc4
--- /dev/null
+++ b/contrib/src/harfbuzz/win32.patch
@@ -0,0 +1,9 @@
+--- 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