Move xkbcommon dynamic loading code into generic linuxbsd folder

Since Wayland uses it too, it only makes sense to have it in the parent directory of both.
geowarin · Jan 25, 2023 · beaff2f · beaff2f
1 parent 4fa6edc
commit beaff2f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/platform/linuxbsd/SCsub b/platform/linuxbsd/SCsub
@@ -11,6 +11,7 @@ common_linuxbsd = [
     "joypad_linux.cpp",
     "freedesktop_portal_desktop.cpp",
     "freedesktop_screensaver.cpp",
+    "xkbcommon-so_wrap.c",
 ]
 
 if env["x11"]:

diff --git a/platform/linuxbsd/x11/SCsub b/platform/linuxbsd/x11/SCsub
@@ -9,7 +9,6 @@ source_files = [
     "dynwrappers/xcursor-so_wrap.c",
     "dynwrappers/xinerama-so_wrap.c",
     "dynwrappers/xinput2-so_wrap.c",
-    "dynwrappers/xkbcommon-so_wrap.c",
     "dynwrappers/xrandr-so_wrap.c",
     "dynwrappers/xrender-so_wrap.c",
     "dynwrappers/xext-so_wrap.c",

diff --git a/platform/linuxbsd/x11/display_server_x11.h b/platform/linuxbsd/x11/display_server_x11.h
@@ -75,10 +75,11 @@
 #include "dynwrappers/xext-so_wrap.h"
 #include "dynwrappers/xinerama-so_wrap.h"
 #include "dynwrappers/xinput2-so_wrap.h"
-#include "dynwrappers/xkbcommon-so_wrap.h"
 #include "dynwrappers/xrandr-so_wrap.h"
 #include "dynwrappers/xrender-so_wrap.h"
 
+#include "../xkbcommon-so_wrap.h"
+
 typedef struct _xrr_monitor_info {
 	Atom name;
 	Bool primary = false;

diff --git a/...uxbsd/x11/dynwrappers/xkbcommon-so_wrap.c → platform/linuxbsd/xkbcommon-so_wrap.c b/...uxbsd/x11/dynwrappers/xkbcommon-so_wrap.c → platform/linuxbsd/xkbcommon-so_wrap.c
diff --git a/...uxbsd/x11/dynwrappers/xkbcommon-so_wrap.h → platform/linuxbsd/xkbcommon-so_wrap.h b/...uxbsd/x11/dynwrappers/xkbcommon-so_wrap.h → platform/linuxbsd/xkbcommon-so_wrap.h