Commit f1bf4b45 authored by Steve Lhomme's avatar Steve Lhomme

contribs: enable winpthreads on all Windows targets

parent 1d156f09
...@@ -25,7 +25,7 @@ endif ...@@ -25,7 +25,7 @@ endif
$(MOVE) $(MOVE)
DEPS_aom = DEPS_aom =
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_aom += pthreads $(DEPS_pthreads) DEPS_aom += pthreads $(DEPS_pthreads)
endif endif
......
...@@ -10,7 +10,7 @@ PKGS_FOUND += mysofa ...@@ -10,7 +10,7 @@ PKGS_FOUND += mysofa
endif endif
DEPS_mysofa += zlib $(DEPS_zlib) DEPS_mysofa += zlib $(DEPS_zlib)
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_mysofa += pthreads $(DEPS_pthreads) DEPS_mysofa += pthreads $(DEPS_pthreads)
endif endif
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
OPENJPEG_VERSION := 2.3.0 OPENJPEG_VERSION := 2.3.0
OPENJPEG_URL := https://github.com/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz OPENJPEG_URL := https://github.com/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_openjpeg += pthreads $(DEPS_pthreads) DEPS_openjpeg += pthreads $(DEPS_pthreads)
endif endif
......
...@@ -28,7 +28,7 @@ $(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz: ...@@ -28,7 +28,7 @@ $(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz:
.sum-protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz
DEPS_protobuf = zlib $(DEPS_zlib) DEPS_protobuf = zlib $(DEPS_zlib)
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_protobuf += pthreads $(DEPS_pthreads) DEPS_protobuf += pthreads $(DEPS_pthreads)
endif endif
......
...@@ -6,9 +6,6 @@ WINPTHREADS_URL := https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mi ...@@ -6,9 +6,6 @@ WINPTHREADS_URL := https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mi
ifdef HAVE_WIN32 ifdef HAVE_WIN32
PKGS += pthreads PKGS += pthreads
endif endif
ifndef HAVE_WINSTORE
PKGS_FOUND += pthreads
endif
$(TARBALLS)/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2: $(TARBALLS)/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2:
$(call download_pkg,$(WINPTHREADS_URL),winpthreads) $(call download_pkg,$(WINPTHREADS_URL),winpthreads)
......
...@@ -14,7 +14,7 @@ endif ...@@ -14,7 +14,7 @@ endif
SRT_CFLAGS := $(CFLAGS) SRT_CFLAGS := $(CFLAGS)
SRT_CXXFLAGS := $(CXXFLAGS) SRT_CXXFLAGS := $(CXXFLAGS)
DEPS_srt = gnutls $(DEPS_gnutls) DEPS_srt = gnutls $(DEPS_gnutls)
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_srt += pthreads $(DEPS_pthreads) DEPS_srt += pthreads $(DEPS_pthreads)
endif endif
......
...@@ -13,7 +13,7 @@ $(TARBALLS)/libupnp-$(UPNP_VERSION).tar.bz2: ...@@ -13,7 +13,7 @@ $(TARBALLS)/libupnp-$(UPNP_VERSION).tar.bz2:
UPNP_CFLAGS := $(CFLAGS) -DUPNP_STATIC_LIB UPNP_CFLAGS := $(CFLAGS) -DUPNP_STATIC_LIB
UPNP_CXXFLAGS := $(CXXFLAGS) -DUPNP_STATIC_LIB UPNP_CXXFLAGS := $(CXXFLAGS) -DUPNP_STATIC_LIB
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_upnp += pthreads $(DEPS_pthreads) DEPS_upnp += pthreads $(DEPS_pthreads)
endif endif
ifdef HAVE_WINSTORE ifdef HAVE_WINSTORE
......
...@@ -30,7 +30,7 @@ endif ...@@ -30,7 +30,7 @@ endif
DEPS_vpx = DEPS_vpx =
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_vpx += pthreads $(DEPS_pthreads) DEPS_vpx += pthreads $(DEPS_pthreads)
endif endif
......
...@@ -40,7 +40,7 @@ ZVBICONF := \ ...@@ -40,7 +40,7 @@ ZVBICONF := \
--without-doxygen \ --without-doxygen \
$(HOSTCONF) $(HOSTCONF)
ifdef HAVE_WINSTORE ifdef HAVE_WIN32
DEPS_upnp += pthreads $(DEPS_pthreads) DEPS_upnp += pthreads $(DEPS_pthreads)
endif endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment