diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 13:31:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 13:42:58 +0200 |
commit | f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4 (patch) | |
tree | 9b3c775ca329b0453593297d2bd7915ac88bb61e /configure | |
parent | 42ee9f3981979880209a60d1ac30057fcfab6e53 (diff) | |
parent | 0c03cc68386443f1e96ab6fb358220faf67cd5ff (diff) | |
download | ffmpeg-f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4.tar.gz |
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff':
mp3: exit on parsing error in mp_decode_frame
rtmppkt: Avoid unescaped backslash in Doxygen comment
fate-lavfi: replace sed/grep/cut combos with awk
build: Plan 9 support
Conflicts:
configure
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 22 |
1 files changed, 21 insertions, 1 deletions
@@ -1071,7 +1071,7 @@ apply(){ cp_if_changed(){ cmp -s "$1" "$2" && echo "$2 is unchanged" && return mkdir -p "$(dirname $2)" - cp -f "$1" "$2" + $cp_f "$1" "$2" } # CONFIG_LIST contains configurable options, while HAVE_LIST is for @@ -2010,6 +2010,7 @@ ar_default="ar" cc_default="gcc" cxx_default="g++" host_cc_default="gcc" +cp_f="cp -f" install="install" ln_s="ln -sf" nm_default="nm -g" @@ -3202,6 +3203,19 @@ case $target_os in ;; minix) ;; + plan9) + add_cppflags -D_C99_SNPRINTF_EXTENSION \ + -D_REENTRANT_SOURCE \ + -D_RESEARCH_SOURCE \ + -DFD_SETSIZE=96 \ + -DHAVE_SOCK_OPTS + add_compat strtod.o strtod=avpriv_strtod + network_extralibs='-lbsd' + exeobjs=compat/plan9/main.o + disable ffserver + ln_s='ln -s -f' + cp_f='cp' + ;; none) ;; *) @@ -3955,6 +3969,12 @@ elif enabled msvc; then enabled x86_32 && disable aligned_stack fi +case $target_os in + plan9) + add_cppflags -Dmain=plan9_main + ;; +esac + enabled_any $THREADS_LIST && enable threads enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; } |