contribs: enable winpthreads on all Windows targets
authorSteve Lhomme <robux4@ycbcr.xyz>
Thu, 17 May 2018 12:27:06 +0000 (14:27 +0200)
committerSteve Lhomme <robux4@ycbcr.xyz>
Thu, 17 May 2018 13:26:33 +0000 (15:26 +0200)
contrib/src/aom/rules.mak
contrib/src/mysofa/rules.mak
contrib/src/openjpeg/rules.mak
contrib/src/protobuf/rules.mak
contrib/src/pthreads/rules.mak
contrib/src/srt/rules.mak
contrib/src/upnp/rules.mak
contrib/src/vpx/rules.mak
contrib/src/zvbi/rules.mak

index 9dff157..28f38bd 100644 (file)
@@ -25,7 +25,7 @@ endif
        $(MOVE)
 
 DEPS_aom =
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_aom += pthreads $(DEPS_pthreads)
 endif
 
index 96b2f65..4c4c318 100644 (file)
@@ -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
 
index e21fa93..184c484 100644 (file)
@@ -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
 
index c542b30..3c6d6b4 100644 (file)
@@ -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
 
index 0b08ed1..bdef761 100644 (file)
@@ -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)
index 0ce545d..6807b4a 100644 (file)
@@ -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
 
index 53b349d..a911c18 100644 (file)
@@ -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
index eea4f9a..848b70e 100644 (file)
@@ -30,7 +30,7 @@ endif
 
 DEPS_vpx =
 
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_vpx += pthreads $(DEPS_pthreads)
 endif
 
index 9f8208a..a329df7 100644 (file)
@@ -40,7 +40,7 @@ ZVBICONF := \
        --without-doxygen \
        $(HOSTCONF)
 
-ifdef HAVE_WINSTORE
+ifdef HAVE_WIN32
 DEPS_upnp += pthreads $(DEPS_pthreads)
 endif
 ifdef HAVE_MACOSX