diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-26 17:23:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 17:23:11 +0100 |
| commit | 5f1107aa30295e686be6f41cb6d17fc2cff1e036 (patch) | |
| tree | 7bce4c680e6686c9d29be8b479be5b39205ce7a3 /platform/server | |
| parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) | |
| parent | be07f86f85ab70a48b310b42faa64e72a74ca694 (diff) | |
Merge pull request #37317 from akien-mga/display-server-rebased
Separate DisplayServer from OS and add multiple windows support
Diffstat (limited to 'platform/server')
| -rw-r--r-- | platform/server/detect.py | 2 | ||||
| -rw-r--r-- | platform/server/os_server.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index db9ba8d036..4ea4bddddd 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -16,7 +16,7 @@ def get_name(): def get_program_suffix(): if (sys.platform == "darwin"): return "osx" - return "x11" + return "linuxbsd" def can_build(): diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 7584293722..d40905718e 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -31,14 +31,14 @@ #ifndef OS_SERVER_H #define OS_SERVER_H +#include "core/input/input_filter.h" #include "drivers/dummy/texture_loader_dummy.h" #include "drivers/unix/os_unix.h" -#include "main/input_default.h" #ifdef __APPLE__ #include "platform/osx/crash_handler_osx.h" #include "platform/osx/semaphore_osx.h" #else -#include "platform/x11/crash_handler_x11.h" +#include "platform/x11/crash_handler_linuxbsd.h" #endif #include "servers/audio_server.h" #include "servers/visual/rasterizer.h" |