diff options
author | Juan Linietsky <juan@godotengine.org> | 2020-03-01 19:14:37 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:32 +0100 |
commit | 4396e98834f159da59ec790f2ff64fb65dacd9ce (patch) | |
tree | d618e96d7a7b856260fd96e5e727f38a26de0724 /platform/uwp | |
parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) |
Refactored Input, create DisplayServer and DisplayServerX11
Diffstat (limited to 'platform/uwp')
-rw-r--r-- | platform/uwp/joypad_uwp.h | 2 | ||||
-rw-r--r-- | platform/uwp/os_uwp.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/platform/uwp/joypad_uwp.h b/platform/uwp/joypad_uwp.h index f2a721f3dd..69431052e5 100644 --- a/platform/uwp/joypad_uwp.h +++ b/platform/uwp/joypad_uwp.h @@ -31,7 +31,7 @@ #ifndef JOYPAD_UWP_H #define JOYPAD_UWP_H -#include "main/input_default.h" +#include "core/input/input.h" ref class JoypadUWP sealed { diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index ac6e0f3dd5..29fd975274 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -32,13 +32,12 @@ #define OS_UWP_H #include "context_egl_uwp.h" +#include "core/input/input.h" #include "core/math/transform_2d.h" -#include "core/os/input.h" #include "core/os/os.h" #include "core/ustring.h" #include "drivers/xaudio2/audio_driver_xaudio2.h" #include "joypad_uwp.h" -#include "main/input_default.h" #include "servers/audio_server.h" #include "servers/visual/rasterizer.h" #include "servers/visual_server.h" |