contribs: enable winpthreads on all Windows targets

8 years ago · f1bf4b45ce
9 changed files with 8 additions and 11 deletions
--- 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

--- 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

--- 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

--- 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

--- 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)
--- 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

--- 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
--- 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

--- 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