summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-05-05 23:02:59 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-05-05 23:02:59 +0000
commitddb7269a1ecc99c2749a4d9cb22cdab3f5aa292c (patch)
tree551c07113858bee4be6bfc7671b56be02220bacf
parent5bc20d8d3cad9bfa34c505fc1dababcbce3cc26a (diff)
downloadmpv-ddb7269a1ecc99c2749a4d9cb22cdab3f5aa292c.tar.bz2
mpv-ddb7269a1ecc99c2749a4d9cb22cdab3f5aa292c.tar.xz
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
-rwxr-xr-xconfigure97
1 files changed, 50 insertions, 47 deletions
diff --git a/configure b/configure
index 61f78d80a8..910c560878 100755
--- a/configure
+++ b/configure
@@ -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"