This commit is contained in:
Camilla Berglund
2013-06-24 14:38:00 +02:00
parent a17dad4f44
commit 4883073b91
5 changed files with 30 additions and 42 deletions
+6 -8
View File
@@ -84,19 +84,18 @@ int _glfwPlatformInit(void)
changeToResourcesDirectory();
#endif
_glfwInitTimer();
_glfwInitJoysticks();
if (!_glfwInitContextAPI())
return GL_FALSE;
_glfw.ns.eventSource = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
if (!_glfw.ns.eventSource)
return GL_FALSE;
CGEventSourceSetLocalEventsSuppressionInterval(_glfw.ns.eventSource, 0.0);
if (!_glfwInitContextAPI())
return GL_FALSE;
_glfwInitTimer();
_glfwInitJoysticks();
return GL_TRUE;
}
@@ -121,7 +120,6 @@ void _glfwPlatformTerminate(void)
free(_glfw.ns.clipboardString);
_glfwTerminateJoysticks();
_glfwTerminateContextAPI();
}