From 5f8108e8a9ee4a5747474adb059156824094e610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Sat, 10 Mar 2018 19:03:00 +0100 Subject: [PATCH] Cocoa: Fix SDK version numbers The pattern for version 10.10 and later was incorrectly applied to version number for 10.8. Fixes #1232. --- src/cocoa_window.m | 2 +- src/nsgl_context.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 077c9e89..a4094a3f 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -872,7 +872,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 }; - (void)loadMainMenu { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 100800 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 [[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&nibObjects]; diff --git a/src/nsgl_context.m b/src/nsgl_context.m index a7cbf00f..82af9063 100644 --- a/src/nsgl_context.m +++ b/src/nsgl_context.m @@ -175,7 +175,7 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window, // Info.plist for unbundled applications // HACK: This assumes that NSOpenGLPixelFormat will remain // a straightforward wrapper of its CGL counterpart -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 100800 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 addAttrib(kCGLPFASupportsAutomaticGraphicsSwitching); #endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ }