Removed usage of TARGET_OS_OSX for building with older SDKs

libsdl-org · Nov 24, 2020 · e4b7d9a · e4b7d9a
1 parent a7d91eb
commit e4b7d9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/joystick/darwin/SDL_iokitjoystick.c b/src/joystick/darwin/SDL_iokitjoystick.c
@@ -528,7 +528,7 @@ JoystickAlreadyKnown(IOHIDDeviceRef ioHIDDeviceObject)
 {
     recDevice *i;
 
-#if TARGET_OS_OSX
+#if defined(SDL_JOYSTICK_MFI) && !TARGET_OS_IOS
     extern SDL_bool IOS_SupportedHIDDevice(IOHIDDeviceRef device);
     if (IOS_SupportedHIDDevice(ioHIDDeviceObject)) {
         return SDL_TRUE;

diff --git a/src/joystick/iphoneos/SDL_mfijoystick.m b/src/joystick/iphoneos/SDL_mfijoystick.m
@@ -60,7 +60,7 @@
  * they are only ever used indirectly through objc_msgSend
  */
 @interface GCController (SDL)
-#if TARGET_OS_OSX && (__MAC_OS_X_VERSION_MAX_ALLOWED <= 101600)
+#if !TARGET_OS_IOS && (__MAC_OS_X_VERSION_MAX_ALLOWED <= 101600)
 + (BOOL)supportsHIDDevice:(IOHIDDeviceRef)device;
 #endif
 @end
@@ -1378,14 +1378,12 @@ -(void)cleanup
     return SDL_FALSE;
 }
 
-#if TARGET_OS_OSX
+#if defined(SDL_JOYSTICK_MFI) && !TARGET_OS_IOS
 SDL_bool IOS_SupportedHIDDevice(IOHIDDeviceRef device)
 {
-#ifdef SDL_JOYSTICK_MFI
     if (is_macos11()) {
         return [GCController supportsHIDDevice:device] ? SDL_TRUE : SDL_FALSE;
     }
-#endif
     return SDL_FALSE;
 }
 #endif