From ac71cb86116c470067d7f03ad2f41f137cbe2dbd Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 14 Jul 2014 07:20:49 +0200 Subject: cocoa: fix compilation on OS X 10.8 --- osdep/macosx_compat.h | 5 +---- osdep/macosx_versions.h | 29 +++++++++++++++++++++++++++++ video/out/gl_cocoa.c | 5 +++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 osdep/macosx_versions.h 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 - -#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 . + */ + +#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 #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); -- cgit v1.2.3