godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Linux: Fix build with use_sowrap=no and various warnings/errors

Browse Source 
(cherry picked from commit dcd16a5750)
This commit is contained in:
Rémi Verschelde
2023-07-06 14:05:28 +02:00
committed by Yuri Sizov
parent e3cfc023b4
commit 6ec2d6d7d0
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/linuxbsd/x11/display_server_x11.cpp
View File

@@ -5449,7 +5449,9 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
}
#else
#ifdef XKB_ENABLED
xkb_loaded = true;
bool xkb_loaded = true;
xkb_loaded_v05p = true;
xkb_loaded_v08p = true;
#endif
#endif
@@ -5476,6 +5478,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
r_error = OK;
#ifdef SOWRAP_ENABLED
{
if (!XcursorImageCreate || !XcursorImageLoadCursor || !XcursorImageDestroy || !XcursorGetDefaultSize || !XcursorGetTheme || !XcursorLibraryLoadImage) {
// There's no API to check version, check if functions are available instead.
@@ -5484,6 +5487,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
return;
}
}
#endif
for (int i = 0; i < CURSOR_MAX; i++) {
cursors[i] = None;