Use native Windows threads on Windows

[wimlib] / tools / windeps / Makefile

diff --git a/tools/windeps/Makefile b/tools/windeps/Makefile
index 732e3174dc2a096a3b95244f507e6acef8144eef..8e883275a9a97f71f034a53147b8c5c39953d1dc 100644 (file)
--- a/tools/windeps/Makefile
+++ b/tools/windeps/Makefile
@@ -10,13 +10,9 @@
 #
 
 ARCHITECTURES          := i686 x86_64
-LIBXML2_VERSION                := 2.10.3
-WINPTHREADS_VERSION    := 10.0.0
 
+LIBXML2_VERSION                := 2.10.3
 LIBXML_URL             := https://download.gnome.org/sources/libxml2/2.10/libxml2-$(LIBXML2_VERSION).tar.xz
-WINPTHREADS_URL                := http://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2
-
-
 LIBXML_SRCDIR          := libxml2-$(LIBXML2_VERSION)
 LIBXML_DIST            := $(LIBXML_SRCDIR).tar.xz
 SRCDIR_TARGETS         += $(LIBXML_SRCDIR)
@@ -28,18 +24,6 @@ $(LIBXML_SRCDIR):$(LIBXML_DIST) checksums_verified
        cp $@/Copyright COPYING.libxml2
 MAKE_CLEAN_FILES += $(LIBXML_SRCDIR) COPYING.libxml2
 
-WINPTHREADS_DIST       := mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2
-WINPTHREADS_SRCDIR     := winpthreads-$(WINPTHREADS_VERSION)
-SRCDIR_TARGETS         += $(WINPTHREADS_SRCDIR)
-DIST_TARGETS           += $(WINPTHREADS_DIST)
-$(WINPTHREADS_DIST):
-       wget $(WINPTHREADS_URL)
-$(WINPTHREADS_SRCDIR):$(WINPTHREADS_DIST) checksums_verified
-       tar xvf $<
-       cp -aT mingw-w64-v$(WINPTHREADS_VERSION)/mingw-w64-libraries/winpthreads $@
-       cp $@/COPYING COPYING.winpthreads
-MAKE_CLEAN_FILES += $(WINPTHREADS_SRCDIR) mingw-w64-v$(WINPTHREADS_VERSION) COPYING.winpthreads
-
 checksums_verified:$(DIST_TARGETS)
        sha256sum -c sha256sums
 
@@ -69,35 +53,11 @@ $(1)_BUILD_TARGETS += libxml_$(1)
 MAKE_CLEAN_FILES += build_libxml_$(1)
 endef
 
-#
-# declare_winpthreads_target(arch)
-#
-define declare_winpthreads_target
-winpthreads_$(1):$(WINPTHREADS_SRCDIR)
-       builddir=build_winpthreads_$(1);                        \
-       rm -rf $$$$builddir;                                    \
-       cp -r $(WINPTHREADS_SRCDIR) $$$$builddir;               \
-       cd $$$$builddir;                                        \
-       ./configure                                             \
-               --host=$(1)-w64-mingw32                         \
-               --enable-static                                 \
-               --disable-shared                                \
-               --prefix=$$$$PWD/../sysroot_$(1)                \
-               CFLAGS=-O2;                                     \
-       $(MAKE) install;                                        \
-       sed -i -e 's/if defined DLL_EXPORT/if 0/'               \
-               ../sysroot_$(1)/include/pthread.h;
-
-$(1)_BUILD_TARGETS += winpthreads_$(1)
-MAKE_CLEAN_FILES += build_winpthreads_$(1)
-endef
-
 #
 # declare_arch_targets(arch)
 #
 define declare_arch_targets
 $(eval $(call declare_libxml_target,$(1)))
-$(eval $(call declare_winpthreads_target,$(1)))
 
 sysroot_$(1): $($(1)_BUILD_TARGETS)