[vlc-commits] Contribs: use HAVE_WINSTORE consistently

Jean-Baptiste Kempf git at videolan.org
Mon May 16 14:50:55 CEST 2016 

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 16 14:49:54 2016 +0200| [1ed47b2d15803e4c142975ded49bedb26d942b30] | committer: Jean-Baptiste Kempf

Contribs: use HAVE_WINSTORE consistently

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

 contrib/src/ass/rules.mak       |    2 +-
 contrib/src/flac/rules.mak      |    2 +-
 contrib/src/gcrypt/rules.mak    |    2 +-
 contrib/src/gnutls/rules.mak    |    2 +-
 contrib/src/gpg-error/rules.mak |    2 +-
 contrib/src/libtasn1/rules.mak  |    2 +-
 contrib/src/libxml2/rules.mak   |    2 +-
 contrib/src/lua/rules.mak       |    2 +-
 contrib/src/pthreads/rules.mak  |    2 +-
 contrib/src/ssh2/rules.mak      |    2 +-
 contrib/src/taglib/rules.mak    |    2 +-
 contrib/src/upnp/rules.mak      |    4 ++--
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 5ec3390..75eed18 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -22,7 +22,7 @@ ifdef HAVE_IOS
 WITH_FONTCONFIG = 0
 WITH_HARFBUZZ = 1
 else
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 WITH_FONTCONFIG = 0
 WITH_HARFBUZZ = 1
 else
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index b578131..8eeff31 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -15,7 +15,7 @@ $(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
 
 flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
 	$(UNPACK)
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/flac/console_write.patch
 	$(APPLY) $(SRC)/flac/remove_blocking_code_useless_flaclib.patch
 endif
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 1026f96..2a22b77 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -15,7 +15,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 	$(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
 	$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
 	$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/gcrypt/winrt.patch
 endif
 	$(MOVE)
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index f6c3352..c4a689c 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -22,7 +22,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/gnutls/gnutls-win32.patch
 	$(APPLY) $(SRC)/gnutls/gnutls-mingw64.patch
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/gnutls/gnutls-winrt.patch
 	$(APPLY) $(SRC)/gnutls/winrt-topendir.patch
 endif
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index c765d7e..32fb973 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -11,7 +11,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error
 	$(UNPACK)
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/gpg-error/windres-make.patch
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/gpg-error/winrt.patch
 endif
 endif
diff --git a/contrib/src/libtasn1/rules.mak b/contrib/src/libtasn1/rules.mak
index 51f6c6f..853ee9e 100644
--- a/contrib/src/libtasn1/rules.mak
+++ b/contrib/src/libtasn1/rules.mak
@@ -14,7 +14,7 @@ $(TARBALLS)/libtasn1-$(LIBTASN1_VERSION).tar.gz:
 
 libtasn1: libtasn1-$(LIBTASN1_VERSION).tar.gz .sum-libtasn1
 	$(UNPACK)
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/libtasn1/no-benchmark.patch
 endif
 	$(MOVE)
diff --git a/contrib/src/libxml2/rules.mak b/contrib/src/libxml2/rules.mak
index a311100..12e6ece 100644
--- a/contrib/src/libxml2/rules.mak
+++ b/contrib/src/libxml2/rules.mak
@@ -38,7 +38,7 @@ libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
 	$(APPLY) $(SRC)/libxml2/win32.patch
 	$(APPLY) $(SRC)/libxml2/bins.patch
 	$(APPLY) $(SRC)/libxml2/pthread.patch
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/libxml2/nogetcwd.patch
 endif
 	$(MOVE)
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index 2c08b9b..037d680 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -48,7 +48,7 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua
 	$(APPLY) $(SRC)/lua/no-dylibs.patch
 	$(APPLY) $(SRC)/lua/no-localeconv.patch
 	$(APPLY) $(SRC)/lua/lua-android-log2.patch
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/lua/winrt-nopopen.patch
 	$(APPLY) $(SRC)/lua/winrt-nosystem.patch
 endif
diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak
index d4b4f69..80597e9 100644
--- a/contrib/src/pthreads/rules.mak
+++ b/contrib/src/pthreads/rules.mak
@@ -16,7 +16,7 @@ ifdef HAVE_WIN32
 pthreads: pthreads-w32-$(PTHREADS_W32_VERSION)-release.tar.gz .sum-pthreads
 	$(UNPACK)
 	sed -e 's/^CROSS.*=/CROSS ?=/' -i.orig $(UNPACK_DIR)/GNUmakefile
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/pthreads/winrt.patch
 endif
 	$(MOVE)
diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak
index a011d11..ac44846 100644
--- a/contrib/src/ssh2/rules.mak
+++ b/contrib/src/ssh2/rules.mak
@@ -20,7 +20,7 @@ ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2
 	$(APPLY) $(SRC)/ssh2/no-tests.patch
 	$(APPLY) $(SRC)/ssh2/configure-zlib.patch
 	$(APPLY) $(SRC)/ssh2/gpg-error-pc.patch
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/ssh2/winrt-no-agent.patch
 endif
 	$(MOVE)
diff --git a/contrib/src/taglib/rules.mak b/contrib/src/taglib/rules.mak
index ea4ecc2..fe9a511 100644
--- a/contrib/src/taglib/rules.mak
+++ b/contrib/src/taglib/rules.mak
@@ -15,7 +15,7 @@ $(TARBALLS)/taglib-$(TAGLIB_VERSION).tar.gz:
 
 taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
 	$(UNPACK)
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/taglib/unicode.patch
 endif
 	$(MOVE)
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 8e6df6e..56c20fa 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -15,7 +15,7 @@ ifdef HAVE_WIN32
 DEPS_upnp += pthreads $(DEPS_pthreads)
 LIBUPNP_ECFLAGS = -DPTW32_STATIC_LIB
 endif
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	CONFIGURE_ARGS=--disable-ipv6 --enable-unspecified_server
 else
 	CONFIGURE_ARGS=--enable-ipv6
@@ -28,7 +28,7 @@ ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/upnp/libupnp-win32.patch
 	$(APPLY) $(SRC)/upnp/libupnp-win64.patch
 	$(APPLY) $(SRC)/upnp/windows-random.patch
-ifdef HAVE_WINRT
+ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/upnp/winrt-dont-force-win32-winnt.patch
 	$(APPLY) $(SRC)/upnp/no-getifinfo.patch
 	$(APPLY) $(SRC)/upnp/winrt-inet.patch

More information about the vlc-commits mailing list