diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 27 |
1 files changed, 2 insertions, 25 deletions
@@ -438,7 +438,6 @@ Video output: --disable-yuv4mpeg disable yuv4mpeg video output [enable] --disable-corevideo disable CoreVideo video output [autodetect] --disable-cocoa disable Cocoa OpenGL backend [autodetect] - --disable-quartz disable Quartz video output [autodetect] Audio output: --disable-alsa disable ALSA audio output [autodetect] @@ -701,7 +700,6 @@ _qtx=auto _coreaudio=auto _corevideo=auto _cocoa=auto -_quartz=auto quicktime=auto _macosx_finder=no _macosx_bundle=auto @@ -1139,8 +1137,6 @@ for ac_option do --disable-corevideo) _corevideo=no ;; --enable-cocoa) _cocoa=yes ;; --disable-cocoa) _cocoa=no ;; - --enable-quartz) _quartz=yes ;; - --disable-quartz) _quartz=no ;; --enable-macosx-finder) _macosx_finder=yes ;; --disable-macosx-finder) _macosx_finder=no ;; --enable-macosx-bundle) _macosx_bundle=yes ;; @@ -3583,7 +3579,7 @@ echocheck "Mac OS X Finder Support" def_macosx_finder='#undef CONFIG_MACOSX_FINDER' if test "$_macosx_finder" = yes ; then def_macosx_finder='#define CONFIG_MACOSX_FINDER 1' - extra_ldflags="$extra_ldflags -framework Carbon" + extra_ldflags="$extra_ldflags -framework Cocoa" fi echores "$_macosx_finder" @@ -3592,7 +3588,6 @@ def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE' test "$_macosx_bundle" = auto && _macosx_bundle=$_macosx_finder if test "$_macosx_bundle" = yes ; then def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1' - extra_ldflags="$extra_ldflags -framework Carbon" fi echores "$_macosx_bundle" @@ -4218,25 +4213,9 @@ if test "$quicktime" = yes ; then def_quicktime='#define CONFIG_QUICKTIME 1' else def_quicktime='#undef CONFIG_QUICKTIME' - _quartz=no fi echores $quicktime -echocheck "Quartz" -if test "$_quartz" = auto ; then - _quartz=no - statement_check Carbon/Carbon.h 'CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false)' -framework Carbon && _quartz=yes -fi -if test "$_quartz" = yes ; then - libs_mplayer="$libs_mplayer -framework Carbon" - def_quartz='#define CONFIG_QUARTZ 1' - vomodules="quartz $vomodules" -else - def_quartz='#undef CONFIG_QUARTZ' - novomodules="quartz $novomodules" -fi -echores $_quartz - echocheck "CoreVideo" if test "$_corevideo" = auto ; then cat > $TMPC <<EOF @@ -4573,7 +4552,7 @@ int main(int argc, char *argv[]) { EOF _gl=no for _ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do - if cc_check $_ld_tmp $_ld_lm ; then + if test "$_cocoa" != yes && cc_check $_ld_tmp $_ld_lm ; then _gl=yes _gl_x11=yes libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl" @@ -6563,7 +6542,6 @@ PVR = $_pvr QTX_CODECS = $_qtx QTX_CODECS_WIN32 = $_qtx_codecs_win32 QTX_EMULATION = $_qtx_emulation -QUARTZ = $_quartz RADIO=$_radio RADIO_CAPTURE=$_radio_capture REAL_CODECS = $_real @@ -6930,7 +6908,6 @@ $def_mga $def_mng $def_png $def_pnm -$def_quartz $def_s3fb $def_sdl $def_sdl_sdl_h |