From a5993c4e2d3d57d4c4b71ba38e983f12d67a2ca1 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 9 Nov 2014 11:58:47 +0200 Subject: [PATCH] Disabled usage of IOKit's HID Manager API on OS X prior to 10.5 Source code only, CMake needs to be updated too --- src/cocoa/i_joystick.cpp | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/cocoa/i_joystick.cpp b/src/cocoa/i_joystick.cpp index 5a1c92e8c..889c38fed 100644 --- a/src/cocoa/i_joystick.cpp +++ b/src/cocoa/i_joystick.cpp @@ -33,6 +33,8 @@ #include "m_joy.h" +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 + #include "HID_Utilities_External.h" #include "d_event.h" @@ -774,3 +776,37 @@ void I_ProcessJoysticks() s_joystickManager->Update(); } } + +#else // prior to 10.5 + +void I_StartupJoysticks() +{ +} + +void I_ShutdownJoysticks() +{ +} + +void I_GetJoysticks(TArray& sticks) +{ + sticks.Clear(); +} + +void I_GetAxes(float axes[NUM_JOYAXIS]) +{ + for (size_t i = 0; i < NUM_JOYAXIS; ++i) + { + axes[i] = 0.0f; + } +} + +IJoystickConfig *I_UpdateDeviceList() +{ + return NULL; +} + +void I_ProcessJoysticks() +{ +} + +#endif // 10.5 or higher