summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-05-04 13:16:04 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-05-04 13:16:04 +0000
commita094d6279bd21fd318efd89bb740c9d33764c1d1 (patch)
treefaf2fb03191886aa6a5851f80d7b9eef0bbc9f20
parent0044b1887744d29ae918e7f5e8799f7ffa8eb3be (diff)
downloadmpv-a094d6279bd21fd318efd89bb740c9d33764c1d1.tar.bz2
mpv-a094d6279bd21fd318efd89bb740c9d33764c1d1.tar.xz
Improve CoreVideo check: Test more #includes, add -framework Carbon to LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29247 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 7e00e7f7f2..6dfebc319f 100755
--- a/configure
+++ b/configure
@@ -3854,15 +3854,18 @@ 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>
+#include <QuickTime/QuickTime.h>
int main(void) { return 0; }
EOF
_corevideo=no
- cc_check -framework Carbon -framework QuartzCore -framework OpenGL && _corevideo=yes
+ cc_check -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL && _corevideo=yes
fi
if test "$_corevideo" = yes ; then
_vomodules="macosx $_vomodules"
- extra_ldflags="$extra_ldflags -framework Cocoa -framework QuartzCore -framework OpenGL"
+ extra_ldflags="$extra_ldflags -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL"
def_corevideo='#define CONFIG_COREVIDEO 1'
else
_novomodules="macosx $_novomodules"