Commit 3638f56d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Enable w32threads automatically unless explicitly disabled
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3fd0f6ed 7b7b220c
...@@ -93,7 +93,7 @@ Configuration options: ...@@ -93,7 +93,7 @@ Configuration options:
--disable-postproc disable libpostproc build --disable-postproc disable libpostproc build
--disable-avfilter disable video filter support [no] --disable-avfilter disable video filter support [no]
--disable-pthreads disable pthreads [auto] --disable-pthreads disable pthreads [auto]
--enable-w32threads use Win32 threads [no] --disable-w32threads disable Win32 threads [auto]
--enable-x11grab enable X11 grabbing [no] --enable-x11grab enable X11 grabbing [no]
--disable-network disable network support [no] --disable-network disable network support [no]
--enable-gray enable full grayscale support (slower color) --enable-gray enable full grayscale support (slower color)
...@@ -2564,6 +2564,7 @@ case $target_os in ...@@ -2564,6 +2564,7 @@ case $target_os in
disable network disable network
else else
target_os=mingw32 target_os=mingw32
enable_weak w32threads
fi fi
LIBTARGET=i386 LIBTARGET=i386
if enabled x86_64; then if enabled x86_64; then
......
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