mirror of https://github.com/godotengine/godot
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.
This commit is contained in:
parent
4fa6edc888
commit
beaff2f5cb
|
|
@ -11,6 +11,7 @@ common_linuxbsd = [
|
||||||
"joypad_linux.cpp",
|
"joypad_linux.cpp",
|
||||||
"freedesktop_portal_desktop.cpp",
|
"freedesktop_portal_desktop.cpp",
|
||||||
"freedesktop_screensaver.cpp",
|
"freedesktop_screensaver.cpp",
|
||||||
|
"xkbcommon-so_wrap.c",
|
||||||
]
|
]
|
||||||
|
|
||||||
if env["x11"]:
|
if env["x11"]:
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@ source_files = [
|
||||||
"dynwrappers/xcursor-so_wrap.c",
|
"dynwrappers/xcursor-so_wrap.c",
|
||||||
"dynwrappers/xinerama-so_wrap.c",
|
"dynwrappers/xinerama-so_wrap.c",
|
||||||
"dynwrappers/xinput2-so_wrap.c",
|
"dynwrappers/xinput2-so_wrap.c",
|
||||||
"dynwrappers/xkbcommon-so_wrap.c",
|
|
||||||
"dynwrappers/xrandr-so_wrap.c",
|
"dynwrappers/xrandr-so_wrap.c",
|
||||||
"dynwrappers/xrender-so_wrap.c",
|
"dynwrappers/xrender-so_wrap.c",
|
||||||
"dynwrappers/xext-so_wrap.c",
|
"dynwrappers/xext-so_wrap.c",
|
||||||
|
|
|
||||||
|
|
@ -75,10 +75,11 @@
|
||||||
#include "dynwrappers/xext-so_wrap.h"
|
#include "dynwrappers/xext-so_wrap.h"
|
||||||
#include "dynwrappers/xinerama-so_wrap.h"
|
#include "dynwrappers/xinerama-so_wrap.h"
|
||||||
#include "dynwrappers/xinput2-so_wrap.h"
|
#include "dynwrappers/xinput2-so_wrap.h"
|
||||||
#include "dynwrappers/xkbcommon-so_wrap.h"
|
|
||||||
#include "dynwrappers/xrandr-so_wrap.h"
|
#include "dynwrappers/xrandr-so_wrap.h"
|
||||||
#include "dynwrappers/xrender-so_wrap.h"
|
#include "dynwrappers/xrender-so_wrap.h"
|
||||||
|
|
||||||
|
#include "../xkbcommon-so_wrap.h"
|
||||||
|
|
||||||
typedef struct _xrr_monitor_info {
|
typedef struct _xrr_monitor_info {
|
||||||
Atom name;
|
Atom name;
|
||||||
Bool primary = false;
|
Bool primary = false;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue