[vlc-commits] contribs: enable winpthreads on all Windows targets

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu May 17 14:27:06 2018 +0200| [f1bf4b45ce547578db7048331e368188a7f6b8ec] | committer: Steve Lhomme

contribs: enable winpthreads on all Windows targets

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

 contrib/src/aom/rules.mak      | 2 +-
 contrib/src/mysofa/rules.mak   | 2 +-
 contrib/src/openjpeg/rules.mak | 2 +-
 contrib/src/protobuf/rules.mak | 2 +-
 contrib/src/pthreads/rules.mak | 3 ---
 contrib/src/srt/rules.mak      | 2 +-
 contrib/src/upnp/rules.mak     | 2 +-
 contrib/src/vpx/rules.mak      | 2 +-
 contrib/src/zvbi/rules.mak     | 2 +-
 9 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index 9dff157053..28f38bd2fb 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -25,7 +25,7 @@ endif
 	$(MOVE)
 
 DEPS_aom =
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_aom += pthreads $(DEPS_pthreads)
 endif
 
diff --git a/contrib/src/mysofa/rules.mak b/contrib/src/mysofa/rules.mak
index 96b2f655af..4c4c318f0f 100644
--- a/contrib/src/mysofa/rules.mak
+++ b/contrib/src/mysofa/rules.mak
@@ -10,7 +10,7 @@ PKGS_FOUND += mysofa
 endif
 
 DEPS_mysofa += zlib $(DEPS_zlib)
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_mysofa += pthreads $(DEPS_pthreads)
 endif
 
diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index e21fa933bf..184c484f00 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -3,7 +3,7 @@
 OPENJPEG_VERSION := 2.3.0
 OPENJPEG_URL := https://github.com/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz
 
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_openjpeg += pthreads $(DEPS_pthreads)
 endif
 
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index c542b30902..3c6d6b489b 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -28,7 +28,7 @@ $(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz:
 .sum-protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz
 
 DEPS_protobuf = zlib $(DEPS_zlib)
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_protobuf += pthreads $(DEPS_pthreads)
 endif
 
diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak
index 0b08ed154d..bdef761bc3 100644
--- a/contrib/src/pthreads/rules.mak
+++ b/contrib/src/pthreads/rules.mak
@@ -6,9 +6,6 @@ WINPTHREADS_URL := https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mi
 ifdef HAVE_WIN32
 PKGS += pthreads
 endif
-ifndef HAVE_WINSTORE
-PKGS_FOUND += pthreads
-endif
 
 $(TARBALLS)/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2:
 	$(call download_pkg,$(WINPTHREADS_URL),winpthreads)
diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
index 0ce545d156..6807b4a7b1 100644
--- a/contrib/src/srt/rules.mak
+++ b/contrib/src/srt/rules.mak
@@ -14,7 +14,7 @@ endif
 SRT_CFLAGS   := $(CFLAGS)
 SRT_CXXFLAGS := $(CXXFLAGS)
 DEPS_srt = gnutls $(DEPS_gnutls)
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_srt += pthreads $(DEPS_pthreads)
 endif
 
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 53b349db13..a911c1896b 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -13,7 +13,7 @@ $(TARBALLS)/libupnp-$(UPNP_VERSION).tar.bz2:
 
 UPNP_CFLAGS   := $(CFLAGS)   -DUPNP_STATIC_LIB
 UPNP_CXXFLAGS := $(CXXFLAGS) -DUPNP_STATIC_LIB
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_upnp += pthreads $(DEPS_pthreads)
 endif
 ifdef HAVE_WINSTORE
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index eea4f9aedc..848b70e400 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -30,7 +30,7 @@ endif
 
 DEPS_vpx =
 
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_vpx += pthreads $(DEPS_pthreads)
 endif
 
diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
index 9f8208a390..a329df7f90 100644
--- a/contrib/src/zvbi/rules.mak
+++ b/contrib/src/zvbi/rules.mak
@@ -40,7 +40,7 @@ ZVBICONF := \
 	--without-doxygen \
 	$(HOSTCONF)
 
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_upnp += pthreads $(DEPS_pthreads)
 endif
 ifdef HAVE_MACOSX