gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Code Issues Projects Releases Wiki Activity

Moved OpenGL framework loading to NSGL module.

Browse Source
This commit is contained in:
Camilla Berglund 2013-05-02 22:41:09 +02:00
parent efe3ee8818
commit f27eca113e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cocoa_init.m
View File

@ -80,15 +80,6 @@ int _glfwPlatformInit(void)
{ {
_glfw.ns.autoreleasePool = [[NSAutoreleasePool alloc] init]; _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) #if defined(_GLFW_USE_CHDIR)
changeToResourcesDirectory(); changeToResourcesDirectory();
#endif #endif

9
src/nsgl_context.m
View File

@ -47,6 +47,15 @@ int _glfwInitContextAPI(void)
return GL_FALSE; 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; return GL_TRUE;
} }