Moved OpenGL framework loading to NSGL module.

master
Camilla Berglund ago%!(EXTRA string=12 years)
parent efe3ee8818
commit f27eca113e
  1. 9
      src/cocoa_init.m
  2. 9
      src/nsgl_context.m

@ -80,15 +80,6 @@ int _glfwPlatformInit(void)
{
_glfw.ns.autoreleasePool = [[NSAutoreleasePool alloc] init];
_glfw.nsgl.framework =
CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengl"));
if (_glfw.nsgl.framework == NULL)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"NSGL: Failed to locate OpenGL framework");
return GL_FALSE;
}
#if defined(_GLFW_USE_CHDIR)
changeToResourcesDirectory();
#endif

@ -47,6 +47,15 @@ int _glfwInitContextAPI(void)
return GL_FALSE;
}
_glfw.nsgl.framework =
CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengl"));
if (_glfw.nsgl.framework == NULL)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"NSGL: Failed to locate OpenGL framework");
return GL_FALSE;
}
return GL_TRUE;
}

Loading…
Cancel
Save