Merge glfw upstream changes to build on Wayland on FreeBSD

This commit is contained in:
Kovid Goyal
2018-03-28 09:47:16 +05:30
parent d0f839bbd8
commit 69f3ceb903
4 changed files with 41 additions and 8 deletions

4
glfw/wl_init.c vendored
View File

@@ -1046,8 +1046,10 @@ int _glfwPlatformInit(void)
// Sync so we got all initial output events
wl_display_roundtrip(_glfw.wl.display);
#ifdef __linux__
if (!_glfwInitJoysticksLinux())
return GLFW_FALSE;
#endif
_glfwInitTimerPOSIX();
@@ -1073,7 +1075,9 @@ int _glfwPlatformInit(void)
void _glfwPlatformTerminate(void)
{
#ifdef __linux__
_glfwTerminateJoysticksLinux();
#endif
_glfwTerminateEGL();
if (_glfw.wl.egl.handle)
{