summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-07-14 07:20:49 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-07-14 07:21:44 +0200
commitac71cb86116c470067d7f03ad2f41f137cbe2dbd (patch)
treedadd8a8c0ba6e1bebd2492bc7633e2910f6d462f
parent9fadc92eb1a194978a07b6774a2a1c72a0ace182 (diff)
downloadmpv-ac71cb86116c470067d7f03ad2f41f137cbe2dbd.tar.bz2
mpv-ac71cb86116c470067d7f03ad2f41f137cbe2dbd.tar.xz
cocoa: fix compilation on OS X 10.8
-rw-r--r--osdep/macosx_compat.h5
-rw-r--r--osdep/macosx_versions.h29
-rw-r--r--video/out/gl_cocoa.c5
3 files changed, 35 insertions, 4 deletions
diff --git a/osdep/macosx_compat.h b/osdep/macosx_compat.h
index f248538619..9775529bc6 100644
--- a/osdep/macosx_compat.h
+++ b/osdep/macosx_compat.h
@@ -22,10 +22,7 @@
#define MPV_MACOSX_COMPAT
#import <Cocoa/Cocoa.h>
-
-#if !defined(MAC_OS_X_VERSION_10_8)
-# define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
-#endif
+#include "osdep/macosx_versions.h"
#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8)
@interface NSArray (SubscriptingAdditions)
diff --git a/osdep/macosx_versions.h b/osdep/macosx_versions.h
new file mode 100644
index 0000000000..83bcf5ddd7
--- /dev/null
+++ b/osdep/macosx_versions.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MPV_MACOSX_VERSIONS
+#define MPV_MACOSX_VERSIONS
+
+#if !defined(MAC_OS_X_VERSION_10_8)
+# define MAC_OS_X_VERSION_10_8 1080
+#endif
+
+#if !defined(MAC_OS_X_VERSION_10_9)
+# define MAC_OS_X_VERSION_10_9 1090
+#endif
+
+#endif /* MPV_MACOSX_VERSIONS */
diff --git a/video/out/gl_cocoa.c b/video/out/gl_cocoa.c
index b3db13fea1..9df1eec4cc 100644
--- a/video/out/gl_cocoa.c
+++ b/video/out/gl_cocoa.c
@@ -21,6 +21,7 @@
#include <OpenGL/OpenGL.h>
#include "cocoa_common.h"
+#include "osdep/macosx_versions.h"
#include "gl_common.h"
struct cgl_context {
@@ -57,8 +58,12 @@ static bool create_gl_context(struct MPGLContext *ctx)
CGLOpenGLProfile gl_vers_map[] = {
[2] = kCGLOGLPVersion_Legacy,
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
[3] = kCGLOGLPVersion_GL3_Core,
[4] = kCGLOGLPVersion_GL4_Core,
+ #else
+ [3] = kCGLOGLPVersion_3_2_Core,
+ #endif
};
int gl_major = MPGL_VER_GET_MAJOR(ctx->requested_gl_version);