You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-07 12:30:27 +00:00
Fix the usage of libudev and dbus with SDL
Previously, libudev was ignored if SOWRAP_ENABLED was defined (it is defined by default) because otherwise it would crash CI builds due to a missing header, and dbus was always linked dynamically. This commit should fix this issue and make libudev usable again
This commit is contained in:
6
thirdparty/sdl/core/linux/SDL_dbus.c
vendored
6
thirdparty/sdl/core/linux/SDL_dbus.c
vendored
@@ -97,15 +97,18 @@ static bool LoadDBUSSyms(void)
|
||||
|
||||
static void UnloadDBUSLibrary(void)
|
||||
{
|
||||
#ifdef SOWRAP_ENABLED // Godot build system constant
|
||||
if (dbus_handle) {
|
||||
SDL_UnloadObject(dbus_handle);
|
||||
dbus_handle = NULL;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool LoadDBUSLibrary(void)
|
||||
{
|
||||
bool result = true;
|
||||
#ifdef SOWRAP_ENABLED // Godot build system constant
|
||||
if (!dbus_handle) {
|
||||
dbus_handle = SDL_LoadObject(dbus_library);
|
||||
if (!dbus_handle) {
|
||||
@@ -118,6 +121,9 @@ static bool LoadDBUSLibrary(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
result = LoadDBUSSyms();
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user