comparison configure @ 15347:18d404eebb28

do not define video_out_macosx if corevideo is not present
author nplourde
date Thu, 05 May 2005 00:17:27 +0000
parents 9080d5651489
children d8ee4d45ec8d
comparison
equal deleted inserted replaced
15346:cdffac8b6555 15347:18d404eebb28
3211 EOF 3211 EOF
3212 if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then 3212 if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then
3213 _vosrc="$_vosrc vo_macosx.m" 3213 _vosrc="$_vosrc vo_macosx.m"
3214 _vomodules="macosx $_vomodules" 3214 _vomodules="macosx $_vomodules"
3215 _macosx_frameworks="$_macosx_frameworks -framework Cocoa -framework QuartzCore -framework OpenGL" 3215 _macosx_frameworks="$_macosx_frameworks -framework Cocoa -framework QuartzCore -framework OpenGL"
3216 _def_macosx_corevideo='#define MACOSX_COREVIDEO 1'
3217 _macosx_corevideo=yes
3216 else 3218 else
3217 _novomodules="macosx $_novomodules" 3219 _novomodules="macosx $_novomodules"
3220 _def_macosx_corevideo='#undef MACOSX_COREVIDEO'
3221 _macosx_corevideo=no
3218 fi 3222 fi
3219 fi 3223 fi
3220 echores "$_macosx" 3224 echores "$_macosx"
3221 3225
3222 echocheck "Mac OS X Finder Support" 3226 echocheck "Mac OS X Finder Support"
6889 XMMS_LIB = $_xmms_lib 6893 XMMS_LIB = $_xmms_lib
6890 MACOSX = $_macosx 6894 MACOSX = $_macosx
6891 MACOSX_FINDER_SUPPORT = $_macosx_finder_support 6895 MACOSX_FINDER_SUPPORT = $_macosx_finder_support
6892 MACOSX_BUNDLE = $_macosx_bundle 6896 MACOSX_BUNDLE = $_macosx_bundle
6893 MACOSX_FRAMEWORKS = $_macosx_frameworks 6897 MACOSX_FRAMEWORKS = $_macosx_frameworks
6898 MACOSX_COREVIDEO = $_macosx_corevideo
6894 TOOLAME=$_toolame 6899 TOOLAME=$_toolame
6895 TOOLAME_EXTRAFLAGS=$_toolame_extraflags 6900 TOOLAME_EXTRAFLAGS=$_toolame_extraflags
6896 TOOLAME_LIB=$_toolame_lib 6901 TOOLAME_LIB=$_toolame_lib
6897 FAAC=$_faac 6902 FAAC=$_faac
6898 FAAC_LIB=$_ld_faac 6903 FAAC_LIB=$_ld_faac
7199 7204
7200 /* Mac OS X specific features */ 7205 /* Mac OS X specific features */
7201 $_def_macosx 7206 $_def_macosx
7202 $_def_macosx_finder_support 7207 $_def_macosx_finder_support
7203 $_def_macosx_bundle 7208 $_def_macosx_bundle
7209 $_def_macosx_corevideo
7204 7210
7205 /* Build our Win32-loader */ 7211 /* Build our Win32-loader */
7206 $_def_win32_loader 7212 $_def_win32_loader
7207 7213
7208 /* ffmpeg's libavcodec support (requires libavcodec source) */ 7214 /* ffmpeg's libavcodec support (requires libavcodec source) */