diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-25 09:19:37 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-25 09:19:37 +0100 |
| commit | f710516babec6c665cda7f35cf175a7ef6d03a07 (patch) | |
| tree | 3fb6caaf31f8723d49781015e32dd50ff8173565 | |
| parent | dc8253824b2a840f63ec5958bdfe8a1242a28197 (diff) | |
| parent | beaff2f5cb54cbad4ad072ff124553f08bc6444d (diff) | |
Merge pull request #72004 from Riteo/xkb-really-common
Move xkbcommon dynamic loading code into generic linuxbsd folder
| -rw-r--r-- | platform/linuxbsd/SCsub | 1 | ||||
| -rw-r--r-- | platform/linuxbsd/x11/SCsub | 1 | ||||
| -rw-r--r-- | platform/linuxbsd/x11/display_server_x11.h | 3 | ||||
| -rw-r--r-- | platform/linuxbsd/xkbcommon-so_wrap.c (renamed from platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.c) | 0 | ||||
| -rw-r--r-- | platform/linuxbsd/xkbcommon-so_wrap.h (renamed from platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.h) | 0 |
5 files changed, 3 insertions, 2 deletions
diff --git a/platform/linuxbsd/SCsub b/platform/linuxbsd/SCsub index fcd739cdc9..3c5dc78c60 100644 --- 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 index d869ce9ecc..8b2e2aabe4 100644 --- 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 index 290e3d6a5e..bfb97ae44c 100644 --- 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/platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.c b/platform/linuxbsd/xkbcommon-so_wrap.c index 601d4c5052..601d4c5052 100644 --- a/platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.c +++ b/platform/linuxbsd/xkbcommon-so_wrap.c diff --git a/platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.h b/platform/linuxbsd/xkbcommon-so_wrap.h index f7e6f4c4cf..f7e6f4c4cf 100644 --- a/platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.h +++ b/platform/linuxbsd/xkbcommon-so_wrap.h |