Merge remote-tracking branch 'qatar/master'

* qatar/master: Enable w32threads automatically unless explicitly disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · 3638f56dca
parent 3fd0f6ed25 7b7b220cf7
commit 3638f56dca
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -93,7 +93,7 @@ Configuration options:
  --disable-postproc       disable libpostproc build
  --disable-avfilter       disable video filter support [no]
  --disable-pthreads       disable pthreads [auto]
-  --enable-w32threads      use Win32 threads [no]
+  --disable-w32threads     disable Win32 threads [auto]
  --enable-x11grab         enable X11 grabbing [no]
  --disable-network        disable network support [no]
  --enable-gray            enable full grayscale support (slower color)
@ -2564,6 +2564,7 @@ case $target_os in
            disable network
        else
            target_os=mingw32
+            enable_weak w32threads
        fi
        LIBTARGET=i386
        if enabled x86_64; then