diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-09-08 07:48:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 07:48:18 +0200 |
| commit | 233a9915173a1e249518b38c50d4d0c7d649498d (patch) | |
| tree | c66041459ebacb14a722659740abb2fa8c1104f7 /platform/osx/os_osx.h | |
| parent | 2e8c73331ad6e4854be7d6f61034d0fee1b0b7eb (diff) | |
| parent | 8c886b9d7a22bfacf25a5f3303c25c099abf55f9 (diff) | |
Merge pull request #6409 from Hinsbart/osx_gamepad
osx: Support gamepad input.
Diffstat (limited to 'platform/osx/os_osx.h')
| -rw-r--r-- | platform/osx/os_osx.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 8f89695a68..e23ae49a35 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -31,6 +31,7 @@ #include "os/input.h" +#include "joystick_osx.h" #include "drivers/unix/os_unix.h" #include "main/input_default.h" #include "servers/visual_server.h" @@ -76,6 +77,7 @@ public: SpatialSound2DServerSW *spatial_sound_2d_server; InputDefault *input; + JoystickOSX *joystick_osx; /* objc */ @@ -203,6 +205,7 @@ public: virtual void set_window_maximized(bool p_enabled); virtual bool is_window_maximized() const; virtual void request_attention(); + virtual String get_joy_guid(int p_device) const; void run(); |