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/osx | |
| parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) | |
Refactored Input, create DisplayServer and DisplayServerX11
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/joypad_osx.h | 2 | ||||
| -rw-r--r-- | platform/osx/os_osx.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h index 2c076b3680..287cf63cc8 100644 --- a/platform/osx/joypad_osx.h +++ b/platform/osx/joypad_osx.h @@ -40,7 +40,7 @@ #include <ForceFeedback/ForceFeedbackConstants.h> #include <IOKit/hid/IOHIDLib.h> -#include "main/input_default.h" +#include "core/input/input.h" struct rec_element { IOHIDElementRef ref; diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index e865c3078f..b98c279f92 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -33,13 +33,12 @@ #define BitMap _QDBitMap // Suppress deprecated QuickDraw definition. -#include "core/os/input.h" +#include "core/input/input.h" #include "crash_handler_osx.h" #include "drivers/coreaudio/audio_driver_coreaudio.h" #include "drivers/coremidi/midi_driver_coremidi.h" #include "drivers/unix/os_unix.h" #include "joypad_osx.h" -#include "main/input_default.h" #include "servers/audio_server.h" #include "servers/visual/rasterizer.h" #include "servers/visual/visual_server_wrap_mt.h" |