Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-01-30 20:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Fix sonames for loaded libraries on OpenBSD

Browse Source
This commit is contained in:
Brad Smith 2024-11-26 20:03:15 -05:00
parent b35641f4a3
commit baf3290308
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 .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 (!module)
{ {
if (platformID == GLFW_PLATFORM_WAYLAND) if (platformID == GLFW_PLATFORM_WAYLAND)
@ -631,7 +636,11 @@ int _glfwInitWayland(void)
return GLFW_FALSE; return GLFW_FALSE;
} }
#if defined(__OpenBSD__)
_glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so");
#else
_glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so.0"); _glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so.0");
#endif
if (!_glfw.wl.cursor.handle) if (!_glfw.wl.cursor.handle)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -648,7 +657,11 @@ int _glfwInitWayland(void)
_glfw.wl.cursor.image_get_buffer = (PFN_wl_cursor_image_get_buffer) _glfw.wl.cursor.image_get_buffer = (PFN_wl_cursor_image_get_buffer)
_glfwPlatformGetModuleSymbol(_glfw.wl.cursor.handle, "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"); _glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so.1");
#endif
if (!_glfw.wl.egl.handle) if (!_glfw.wl.egl.handle)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -663,7 +676,11 @@ int _glfwInitWayland(void)
_glfw.wl.egl.window_resize = (PFN_wl_egl_window_resize) _glfw.wl.egl.window_resize = (PFN_wl_egl_window_resize)
_glfwPlatformGetModuleSymbol(_glfw.wl.egl.handle, "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"); _glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so.0");
#endif
if (!_glfw.wl.xkb.handle) if (!_glfw.wl.xkb.handle)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -739,7 +756,11 @@ int _glfwInitWayland(void)
} }
if (_glfw.hints.init.wl.libdecorMode == GLFW_WAYLAND_PREFER_LIBDECOR) 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"); _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so.0");
#endif
if (_glfw.wl.libdecor.handle) if (_glfw.wl.libdecor.handle)
{ {