diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-19 11:47:03 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-19 11:47:03 +0300 |
| commit | 136b25133d67e9765a954a576ea272c4a0185c52 (patch) | |
| tree | 654021d86604d114e8d2bc34b5c535406541d04c /src/skel | |
| parent | c707f92d0aacde3f1ae4fa38c21b29a14c4675f1 (diff) | |
| parent | 71e0895dc60303d364c7972608e51c1a027f19fc (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/sampman_miles.cpp
# src/audio/sampman_oal.cpp
Diffstat (limited to 'src/skel')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index cd517232..eee3dcc9 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -52,11 +52,7 @@ long _dwOperatingSystemVersion; #include "Font.h" #include "MemoryMgr.h" -// We found out that GLFW's keyboard input handling is still pretty delayed/not stable, so now we fetch input from X11 directly on Linux. -#if !defined _WIN32 && !defined __APPLE__ && !defined GTA_HANDHELD // && !defined WAYLAND -#define GET_KEYBOARD_INPUT_FROM_X11 -#endif - +// This is defined on project-level, via premake5 or cmake #ifdef GET_KEYBOARD_INPUT_FROM_X11 #include <X11/Xlib.h> #include <X11/XKBlib.h> |