From 03806044c2982cf163b758a5205bef49777dfc26 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Mon, 19 Jan 2015 17:09:39 +0000 Subject: build: fix mingw Jenkins builds git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6773 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/module.defs | 2 +- make/configure.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libhb/module.defs b/libhb/module.defs index 473a058ca..11b8a22c6 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -54,7 +54,7 @@ else ifeq ($(BUILD.system),linux) LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 else ifeq ($(BUILD.system),mingw) LIBHB.GCC.D += SYS_MINGW -ifeq ($(HAS.pthreadGC2),1) +ifneq ($(HAS.pthread),1) LIBHB.GCC.D += PTW32_STATIC_LIB endif LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import -static diff --git a/make/configure.py b/make/configure.py index e1e8e4d66..5f155fd70 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1732,10 +1732,10 @@ int main() doc.addBlank() if not dlfcn.fail: doc.add( 'HAS.dlfcn', 1 ) - if not pthread.fail: - doc.add( 'HAS.pthread', 1 ) if not pthreadGC2.fail: doc.add( 'HAS.pthreadGC2', 1 ) + elif not pthread.fail: + doc.add( 'HAS.pthread', 1 ) if not bz2.fail: doc.add( 'HAS.bz2', 1 ) if not libz.fail: -- cgit v1.2.3