gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed building with older macOS SDK

Browse Source
This commit is contained in:
Sam Lantinga
2023-11-16 10:49:13 -08:00
parent 8043dad369
commit ac1f896f89
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/apple/SDL_mfijoystick.m
View File

@@ -50,7 +50,6 @@
static id connectObserver = nil; static id connectObserver = nil;
static id disconnectObserver = nil; static id disconnectObserver = nil;
static NSString *GCInputXboxShareButton = @"Button Share";
#include <Availability.h> #include <Availability.h>
#include <objc/message.h> #include <objc/message.h>
@@ -420,7 +419,7 @@ static BOOL IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
if (controller.physicalInputProfile.buttons[GCInputXboxPaddleOne] != nil) { if (controller.physicalInputProfile.buttons[GCInputXboxPaddleOne] != nil) {
device->has_xbox_paddles = SDL_TRUE; device->has_xbox_paddles = SDL_TRUE;
} }
if (controller.physicalInputProfile.buttons[GCInputXboxShareButton] != nil) { if (controller.physicalInputProfile.buttons[@"Button Share"] != nil) {
device->has_xbox_share_button = SDL_TRUE; device->has_xbox_share_button = SDL_TRUE;
} }
} }
@@ -627,7 +626,7 @@ static BOOL IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
device->button_mask |= (1 << SDL_GAMEPAD_BUTTON_LEFT_PADDLE2); device->button_mask |= (1 << SDL_GAMEPAD_BUTTON_LEFT_PADDLE2);
++nbuttons; ++nbuttons;
} }
if (controller.physicalInputProfile.buttons[GCInputXboxShareButton] != nil) { if (controller.physicalInputProfile.buttons[@"Button Share"] != nil) {
device->has_xbox_share_button = SDL_TRUE; device->has_xbox_share_button = SDL_TRUE;
device->button_mask |= (1 << SDL_GAMEPAD_BUTTON_MISC1); device->button_mask |= (1 << SDL_GAMEPAD_BUTTON_MISC1);
++nbuttons; ++nbuttons;
@@ -1271,7 +1270,7 @@ static void IOS_MFIJoystickUpdate(SDL_Joystick *joystick)
} }
if (device->has_xbox_share_button) { if (device->has_xbox_share_button) {
buttons[button_count++] = controller.physicalInputProfile.buttons[GCInputXboxShareButton].isPressed; buttons[button_count++] = controller.physicalInputProfile.buttons[@"Button Share"].isPressed;
} }
#endif #endif
#pragma clang diagnostic pop #pragma clang diagnostic pop
@@ -1885,6 +1884,7 @@ static void IOS_JoystickQuit(void)
static SDL_bool IOS_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out) static SDL_bool IOS_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
{ {
#ifdef ENABLE_PHYSICAL_INPUT_PROFILE
SDL_JoystickDeviceItem *device = GetDeviceForIndex(device_index); SDL_JoystickDeviceItem *device = GetDeviceForIndex(device_index);
if (device == NULL) { if (device == NULL) {
return SDL_FALSE; return SDL_FALSE;
@@ -2019,6 +2019,9 @@ static SDL_bool IOS_JoystickGetGamepadMapping(int device_index, SDL_GamepadMappi
} }
return SDL_TRUE; return SDL_TRUE;
#else
return SDL_FALSE;
#endif /* ENABLE_PHYSICAL_INPUT_PROFILE */
} }
#if defined(SDL_JOYSTICK_MFI) && defined(__MACOS__) #if defined(SDL_JOYSTICK_MFI) && defined(__MACOS__)