organicmaps/glfw
13
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-04-05 05:25:07 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge baf3290308 into e7ea71be03

Browse source
This commit is contained in:
Brad Smith 2025-01-14 20:07:44 +01:00 • committed by GitHub
commit 97e1e27a9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/wl_init.c
View file

@ -518,7 +518,12 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
.createWindowSurface = _glfwCreateWindowSurfaceWayland
};
void* module = _glfwPlatformLoadModule("libwayland-client.so.0");
void* module;
#if defined(__OpenBSD__)
module = _glfwPlatformLoadModule("libwayland-client.so");
#else
module = _glfwPlatformLoadModule("libwayland-client.so.0");
#endif
if (!module)
{
if (platformID == GLFW_PLATFORM_WAYLAND)
@ -631,7 +636,11 @@ int _glfwInitWayland(void)
return GLFW_FALSE;
}
#if defined(__OpenBSD__)
_glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so");
#else
_glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so.0");
#endif
if (!_glfw.wl.cursor.handle)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
@ -648,7 +657,11 @@ int _glfwInitWayland(void)
_glfw.wl.cursor.image_get_buffer = (PFN_wl_cursor_image_get_buffer)
_glfwPlatformGetModuleSymbol(_glfw.wl.cursor.handle, "wl_cursor_image_get_buffer");
#if defined(__OpenBSD__)
_glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so");
#else
_glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so.1");
#endif
if (!_glfw.wl.egl.handle)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
@ -663,7 +676,11 @@ int _glfwInitWayland(void)
_glfw.wl.egl.window_resize = (PFN_wl_egl_window_resize)
_glfwPlatformGetModuleSymbol(_glfw.wl.egl.handle, "wl_egl_window_resize");
#if defined(__OpenBSD__)
_glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so");
#else
_glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so.0");
#endif
if (!_glfw.wl.xkb.handle)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
@ -743,7 +760,11 @@ int _glfwInitWayland(void)
}
if (_glfw.hints.init.wl.libdecorMode == GLFW_WAYLAND_PREFER_LIBDECOR)
#if defined(__OpenBSD__)
_glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so");
#else
_glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so.0");
#endif
if (_glfw.wl.libdecor.handle)
{