diff options
| author | jstebbins <[email protected]> | 2015-01-19 17:09:39 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2015-01-19 17:09:39 +0000 |
| commit | 03806044c2982cf163b758a5205bef49777dfc26 (patch) | |
| tree | 4196140ebdaad446fc186f14217fdd25f73ef95c | |
| parent | 2e7330affab701fb1443fec449e2b04690b32e33 (diff) | |
build: fix mingw Jenkins builds
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6773 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/module.defs | 2 | ||||
| -rw-r--r-- | 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: |