Commit 8eee7025 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Collect the different thread variables in a nice easy to reuse list.

based on a patch by Ramiro Polla, angustia arrozcru no-ip org

Originally committed as revision 8128 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 738940e8
...@@ -577,12 +577,19 @@ CONFIG_LIST=' ...@@ -577,12 +577,19 @@ CONFIG_LIST='
zlib zlib
' '
THREADS_LIST='
beosthreads
os2threads
pthreads
w32threads
'
HAVE_LIST=' HAVE_LIST='
$THREADS_LIST
altivec altivec
altivec_h altivec_h
armv5te armv5te
armv6 armv6
beosthreads
byteswap_h byteswap_h
cmov cmov
dcbzl dcbzl
...@@ -608,15 +615,12 @@ HAVE_LIST=' ...@@ -608,15 +615,12 @@ HAVE_LIST='
mmi mmi
mmx mmx
os2 os2
os2threads
pthreads
sdl sdl
sdl_video_size sdl_video_size
soundcard_h soundcard_h
sys_poll_h sys_poll_h
sys_soundcard_h sys_soundcard_h
threads threads
w32threads
' '
TARGET_LIST=' TARGET_LIST='
...@@ -631,15 +635,12 @@ TARGET_LIST=' ...@@ -631,15 +635,12 @@ TARGET_LIST='
CMDLINE_SELECT=" CMDLINE_SELECT="
$CONFIG_LIST $CONFIG_LIST
$TARGET_LIST $TARGET_LIST
$THREADS_LIST
amr_if2 amr_if2
debug debug
extra_warnings extra_warnings
shared shared
static static
beosthreads
os2threads
pthreads
w32threads
" "
flashsv_decoder_deps="zlib" flashsv_decoder_deps="zlib"
...@@ -1521,7 +1522,7 @@ if enabled pthreads; then ...@@ -1521,7 +1522,7 @@ if enabled pthreads; then
fi fi
fi fi
for thread in pthreads beosthreads os2threads w32threads; do for thread in $THREADS_LIST; do
if enabled $thread; then if enabled $thread; then
if ! disabled thread_type ; then if ! disabled thread_type ; then
die "ERROR: Only one thread type must be selected." die "ERROR: Only one thread type must be selected."
...@@ -1733,7 +1734,7 @@ enabled_any $DECODER_LIST && enable decoders ...@@ -1733,7 +1734,7 @@ enabled_any $DECODER_LIST && enable decoders
enabled_any $MUXER_LIST && enable muxers enabled_any $MUXER_LIST && enable muxers
enabled_any $DEMUXER_LIST && enable demuxers enabled_any $DEMUXER_LIST && enable demuxers
enabled_any pthreads beosthreads os2threads w32threads && enable threads enabled_any $THREADS_LIST && enable threads
check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \ check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \
$DEMUXER_LIST $MUXER_LIST $DEMUXER_LIST $MUXER_LIST
......
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