[vlc-commits] Contribs: don't use fontconfig on Windows

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed May 30 09:14:39 2018 +0200| [9daacd0283b667dec9ba05d0dbdb5192d6789f14] | committer: Jean-Baptiste Kempf

Contribs: don't use fontconfig on Windows

It's not needed anymore :)

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

 contrib/src/ass/rules.mak        | 2 +-
 contrib/src/fontconfig/rules.mak | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 61edbe81a1..66680d0c31 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -22,7 +22,7 @@ ifdef HAVE_DARWIN_OS
 WITH_FONTCONFIG = 0
 WITH_HARFBUZZ = 1
 else
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 WITH_FONTCONFIG = 0
 WITH_HARFBUZZ = 1
 WITH_DWRITE = 1
diff --git a/contrib/src/fontconfig/rules.mak b/contrib/src/fontconfig/rules.mak
index 23a8e8c095..1e7479b004 100644
--- a/contrib/src/fontconfig/rules.mak
+++ b/contrib/src/fontconfig/rules.mak
@@ -3,7 +3,9 @@
 FONTCONFIG_VERSION := 2.12.3
 FONTCONFIG_URL := https://www.freedesktop.org/software/fontconfig/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
 
+ifndef HAVE_WIN32
 PKGS += fontconfig
+endif
 ifeq ($(call need_pkg,"fontconfig >= 2.11"),)
 PKGS_FOUND += fontconfig
 endif