ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-09 22:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: don't define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_* macro's

Browse source 
They mess with #ifdef conditional in headers.
This commit is contained in:
Anonymous Maarten 2023-08-30 19:28:11 +02:00
parent f032e8c191
commit bb1fe302cf
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/video/wayland/SDL_waylanddyn.c
View file

@ -37,34 +37,29 @@ typedef struct
const char *libname; const char *libname;
} waylanddynlib; } waylanddynlib;
#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL NULL
#endif
#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR NULL
#endif
#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON NULL
#endif
#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR NULL
#endif
static waylanddynlib waylandlibs[] = { static waylanddynlib waylandlibs[] = {
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
{ NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC }, { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC },
{ NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL }, #endif
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
{ NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR }, { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR },
#endif
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
{ NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON }, { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON },
{ NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR } #endif
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR
{ NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR },
#endif
{ NULL, NULL }
}; };
static void *WAYLAND_GetSym(const char *fnname, int *pHasModule, SDL_bool required) static void *WAYLAND_GetSym(const char *fnname, int *pHasModule, SDL_bool required)
{ {
int i;
void *fn = NULL; void *fn = NULL;
for (i = 0; i < SDL_TABLESIZE(waylandlibs); i++) { waylanddynlib *dynlib;
if (waylandlibs[i].lib != NULL) { for (dynlib = waylandlibs; dynlib->libname; dynlib++) {
fn = SDL_LoadFunction(waylandlibs[i].lib, fnname); if (dynlib->lib != NULL) {
fn = SDL_LoadFunction(dynlib->lib, fnname);
if (fn != NULL) { if (fn != NULL) {
break; break;
} }
@ -72,10 +67,11 @@ static void *WAYLAND_GetSym(const char *fnname, int *pHasModule, SDL_bool requir
} }
#if DEBUG_DYNAMIC_WAYLAND #if DEBUG_DYNAMIC_WAYLAND
if (fn != NULL) if (fn != NULL) {
SDL_Log("WAYLAND: Found '%s' in %s (%p)\n", fnname, waylandlibs[i].libname, fn); SDL_Log("WAYLAND: Found '%s' in %s (%p)\n", fnname, dynlib->libname, fn);
else } else {
SDL_Log("WAYLAND: Symbol '%s' NOT FOUND!\n", fnname); SDL_Log("WAYLAND: Symbol '%s' NOT FOUND!\n", fnname);
}
#endif #endif
if (fn == NULL && required) { if (fn == NULL && required) {