Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick…

… support.
libsdl-org · Mar 18, 2007 · ecc703d · ecc703d
1 parent 9a7ba9d
commit ecc703d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
@@ -690,9 +690,10 @@ SDL_SYS_JoystickInit(void)
 */
 
         /* Filter device list to non-keyboard/mouse stuff */
-        if ((device->usagePage != kHIDPage_GenericDesktop) ||
-            ((device->usage != kHIDUsage_GD_Joystick &&
-              device->usage != kHIDUsage_GD_GamePad))) {
+        if ( (device->usagePage != kHIDPage_GenericDesktop) ||
+             ((device->usage != kHIDUsage_GD_Joystick &&
+               device->usage != kHIDUsage_GD_GamePad &&
+               device->usage != kHIDUsage_GD_MultiAxisController)) ) {
 
             /* release memory for the device */
             HIDDisposeDevice(&device);