Mercurial > mplayer.hg
changeset 27996:4480c422624d
now that we have a specific check to enable ao_macosx or not, don't let test
for vo_quartz set if ao_macosx should be enabled or not: it's redundant.
| author | gpoirier |
|---|---|
| date | Mon, 24 Nov 2008 17:29:37 +0000 |
| parents | 2aaf331731eb |
| children | d48572283677 |
| files | configure |
| diffstat | 1 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Nov 24 17:27:05 2008 +0000 +++ b/configure Mon Nov 24 17:29:37 2008 +0000 @@ -3606,21 +3606,15 @@ 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'