diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-25 21:12:01 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-25 21:12:01 +0200 |
| commit | 835511ac394d5283c9c449e6154ccb0db1365321 (patch) | |
| tree | c223ee6b82481a0030273cfae9e831dada249fd8 /configure | |
| parent | 6c712271ce9e8d4eb9cd615e920139ebcb1d1d49 (diff) | |
| parent | cc5e0406412a5f8b4e6e7094f6ffa18a65decd74 (diff) | |
| download | mpv-835511ac394d5283c9c449e6154ccb0db1365321.tar.bz2 mpv-835511ac394d5283c9c449e6154ccb0db1365321.tar.xz | |
Merge svn changes up to r28038
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 32 |
1 files changed, 20 insertions, 12 deletions
@@ -1488,7 +1488,7 @@ if test "`basename $_cc`" = "icc" || test "`basename $_cc`" = "ecc"; then cc_version="v. ?.??, bad" cc_fail=yes ;; - 10.1) + 10.1|11.0) cc_version="$cc_version, ok" ;; *) @@ -3582,9 +3582,23 @@ if test "$_macosx" = auto ; then fi if test "$_macosx" = yes ; then cat > $TMPC <<EOF +#include <CoreAudio/CoreAudio.h> +int main(void) { return 0; } +EOF + if cc_check -framework CoreAudio; then + _ld_extra="$_ld_extra -framework CoreAudio -framework AudioUnit -framework AudioToolbox" + _coreaudio=yes + _def_coreaudio='#define CONFIG_COREAUDIO 1' + _aosrc="$_aosrc ao_macosx.c" + _aomodules="macosx $_aomodules" + else + _coreaudio=no + _def_coreaudio='#undef CONFIG_COREAUDIO' + _noaomodules="macosx $_noaomodules" + fi + cat > $TMPC <<EOF #include <Carbon/Carbon.h> #include <QuickTime/QuickTime.h> -#include <CoreAudio/CoreAudio.h> int main(void) { EnterMovies(); ExitMovies(); @@ -3592,21 +3606,15 @@ int main(void) { return 0; } EOF - if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then - _ld_extra="$_ld_extra -framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox" - _coreaudio=yes - _def_coreaudio='#define CONFIG_COREAUDIO 1' - _aosrc="$_aosrc ao_macosx.c" - _aomodules="macosx $_aomodules" + if cc_check -framework Carbon -framework QuickTime; then + _ld_extra="$_ld_extra -framework Carbon -framework QuickTime" + _quartz=yes _def_quartz='#define CONFIG_QUARTZ 1' _vosrc="$_vosrc vo_quartz.c" _vomodules="quartz $_vomodules" _def_quicktime='#define CONFIG_QUICKTIME 1' else - _macosx=no - _coreaudio=no - _def_coreaudio='#undef CONFIG_COREAUDIO' - _noaomodules="macosx $_noaomodules" + _quartz=yes _def_quartz='#undef CONFIG_QUARTZ' _novomodules="quartz $_novomodules" _def_quicktime='#undef CONFIG_QUICKTIME' |