1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 10:02:17 +00:00

cosmetics: Move Quartz and CoreVideo checks into the vo driver section.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29269 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-05-05 23:02:59 +00:00
parent 5bc20d8d3c
commit ddb7269a1e

97
configure vendored
View File

@ -3807,53 +3807,6 @@ echores "$_sys_sysinfo"
if darwin; then
echocheck "Quartz framework"
if test "$_quartz" = auto ; then
cat > $TMPC <<EOF
#include <Carbon/Carbon.h>
#include <QuickTime/QuickTime.h>
int main(void) {
EnterMovies();
ExitMovies();
CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
return 0;
}
EOF
_quartz=no
cc_check -framework Carbon -framework QuickTime && _quartz=yes
fi
if test "$_quartz" = yes ; then
libs_mplayer="$libs_mplayer -framework Carbon -framework QuickTime"
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
#include <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
#include <OpenGL/OpenGL.h>
#include <QuartzCore/CoreVideo.h>
int main(void) { return 0; }
EOF
_corevideo=no
cc_check -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL && _corevideo=yes
fi
if test "$_corevideo" = yes ; then
_vomodules="corevideo $_vomodules"
libs_mplayer="$libs_mplayer -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL"
def_corevideo='#define CONFIG_COREVIDEO 1'
else
_novomodules="corevideo $_novomodules"
def_corevideo='#undef CONFIG_COREVIDEO'
fi
echores "$_corevideo"
echocheck "Mac OS X Finder Support"
def_macosx_finder='#undef CONFIG_MACOSX_FINDER'
test "$_macosx_finder" = yes && def_macosx_finder='#define CONFIG_MACOSX_FINDER 1'
@ -4834,6 +4787,56 @@ else
fi
if darwin; then
echocheck "Quartz"
if test "$_quartz" = auto ; then
cat > $TMPC <<EOF
#include <Carbon/Carbon.h>
#include <QuickTime/QuickTime.h>
int main(void) {
EnterMovies();
ExitMovies();
CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
return 0;
}
EOF
_quartz=no
cc_check -framework Carbon -framework QuickTime && _quartz=yes
fi
if test "$_quartz" = yes ; then
libs_mplayer="$libs_mplayer -framework Carbon -framework QuickTime"
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
#include <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
#include <OpenGL/OpenGL.h>
#include <QuartzCore/CoreVideo.h>
int main(void) { return 0; }
EOF
_corevideo=no
cc_check -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL && _corevideo=yes
fi
if test "$_corevideo" = yes ; then
_vomodules="corevideo $_vomodules"
libs_mplayer="$libs_mplayer -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL"
def_corevideo='#define CONFIG_COREVIDEO 1'
else
_novomodules="corevideo $_novomodules"
def_corevideo='#undef CONFIG_COREVIDEO'
fi
echores "$_corevideo"
fi #if darwin
echocheck "PNG support"