diff --git a/apple/common/apple_gamecontroller.m b/apple/common/apple_gamecontroller.m index 2b11c895f1..08cc4f0a05 100644 --- a/apple/common/apple_gamecontroller.m +++ b/apple/common/apple_gamecontroller.m @@ -26,14 +26,10 @@ #import #include "apple_input.h" -#ifdef IOS - -#endif - static void apple_gamecontroller_poll(GCController* controller) { #ifdef IOS - if (!(IOS_IS_VERSION_7_OR_HIGHER())) + if (IOS_IS_VERSION_6_OR_LOWER()) return; #endif if (!controller || controller.playerIndex == MAX_PLAYERS) @@ -83,7 +79,7 @@ static void apple_gamecontroller_poll(GCController* controller) void apple_gamecontroller_poll_all(void) { #ifdef IOS - if (!(IOS_IS_VERSION_7_OR_HIGHER())) + if (IOS_IS_VERSION_6_OR_LOWER()) return; #endif NSArray* controllers = [GCController controllers]; @@ -95,7 +91,7 @@ void apple_gamecontroller_poll_all(void) void apple_gamecontroller_connect(GCController* controller) { #ifdef IOS - if (!(IOS_IS_VERSION_7_OR_HIGHER())) + if (IOS_IS_VERSION_6_OR_LOWER()) return; #endif int32_t slot = apple_joypad_connect_gcapi(); @@ -116,7 +112,7 @@ void apple_gamecontroller_connect(GCController* controller) void apple_gamecontroller_disconnect(GCController* controller) { #ifdef IOS - if (!(IOS_IS_VERSION_7_OR_HIGHER())) + if (IOS_IS_VERSION_6_OR_LOWER()) return; #endif if (controller.playerIndex == GCControllerPlayerIndexUnset) @@ -128,7 +124,7 @@ void apple_gamecontroller_disconnect(GCController* controller) void apple_gamecontroller_init(void) { #ifdef IOS - if (!(IOS_IS_VERSION_7_OR_HIGHER())) + if (IOS_IS_VERSION_6_OR_LOWER()) return; #endif diff --git a/apple/iOS/platform.h b/apple/iOS/platform.h index 6738400769..8fd9e3125c 100644 --- a/apple/iOS/platform.h +++ b/apple/iOS/platform.h @@ -74,5 +74,6 @@ void ios_set_bluetooth_mode(NSString* mode); int get_ios_version_major(void); #define IOS_IS_VERSION_7_OR_HIGHER() ((get_ios_version_major() >= 7)) +#define IOS_IS_VERSION_6_OR_LOWER() ((get_ios_version_major() <= 6)) #endif