From 1fca33b3c155b1059263a67a6a89e102cb1ae061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Wed, 27 Mar 2019 20:03:05 +0100 Subject: [PATCH] Cocoa: Remove checks for pre-10.8 SDK OS X 10.8 is now the minimum required version but these checks were not removed when that change was made. --- src/cocoa_init.m | 4 ---- src/nsgl_context.m | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/cocoa_init.m b/src/cocoa_init.m index 2575f8e1..ab46f565 100644 --- a/src/cocoa_init.m +++ b/src/cocoa_init.m @@ -435,13 +435,9 @@ static GLFWbool initializeTIS(void) if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"]) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 [[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&_glfw.ns.nibObjects]; -#else - [[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp]; -#endif } else createMenuBar(); diff --git a/src/nsgl_context.m b/src/nsgl_context.m index 1a709bb5..e26dae7d 100755 --- a/src/nsgl_context.m +++ b/src/nsgl_context.m @@ -232,9 +232,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 >= 1080 addAttrib(kCGLPFASupportsAutomaticGraphicsSwitching); -#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ } #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000