diff options
| author | punto- <ariel@okamstudio.com> | 2015-02-12 16:04:03 +0100 |
|---|---|---|
| committer | punto- <ariel@okamstudio.com> | 2015-02-12 16:04:03 +0100 |
| commit | d0ea4754057663d2caefbabe32421fd597a8a15d (patch) | |
| tree | 7262931e710a677b6a66cc799df2740f21f66593 /platform/windows/os_windows.h | |
| parent | b3a6cc097d5bc60ee6e7ba30b177bed3a8aadc71 (diff) | |
| parent | 97e46194f4d524ff8db773f42288fa80f306433b (diff) | |
Merge pull request #1359 from Hinsbart/fix_win_joy
fix get_joy_name() on windows
Diffstat (limited to 'platform/windows/os_windows.h')
| -rw-r--r-- | platform/windows/os_windows.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 20993c6419..210e25d2d6 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -187,6 +187,7 @@ protected: void probe_joysticks(); void process_joysticks(); void process_key_events(); + String get_joystick_name( int id, JOYCAPS jcaps); struct ProcessInfo { |