Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiling on tvOS

Browse Source
This commit is contained in:
Sam Lantinga 2020-11-25 11:31:17 -08:00
parent 9ec2cf5629
commit 6a7f29cdbb
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/darwin/SDL_iokitjoystick.c
View File

@ -528,7 +528,7 @@ JoystickAlreadyKnown(IOHIDDeviceRef ioHIDDeviceObject)
{ {
recDevice *i; recDevice *i;
#if defined(SDL_JOYSTICK_MFI) && !TARGET_OS_IOS #if defined(SDL_JOYSTICK_MFI)
extern SDL_bool IOS_SupportedHIDDevice(IOHIDDeviceRef device); extern SDL_bool IOS_SupportedHIDDevice(IOHIDDeviceRef device);
if (IOS_SupportedHIDDevice(ioHIDDeviceObject)) { if (IOS_SupportedHIDDevice(ioHIDDeviceObject)) {
return SDL_TRUE; return SDL_TRUE;

27
src/joystick/iphoneos/SDL_mfijoystick.m
View File

@ -39,13 +39,15 @@
#if TARGET_OS_IOS #if TARGET_OS_IOS
#define SDL_JOYSTICK_iOS_ACCELEROMETER #define SDL_JOYSTICK_iOS_ACCELEROMETER
#import <CoreMotion/CoreMotion.h> #import <CoreMotion/CoreMotion.h>
#else /* TARGET_OS_OSX */ #endif
#if defined(__MACOSX__)
#include <IOKit/hid/IOHIDManager.h> #include <IOKit/hid/IOHIDManager.h>
#include <AppKit/NSApplication.h> #include <AppKit/NSApplication.h>
#ifndef NSAppKitVersionNumber10_15 #ifndef NSAppKitVersionNumber10_15
#define NSAppKitVersionNumber10_15 1894 #define NSAppKitVersionNumber10_15 1894
#endif #endif
#endif #endif /* __MACOSX__ */
#ifdef SDL_JOYSTICK_MFI #ifdef SDL_JOYSTICK_MFI
#import <GameController/GameController.h> #import <GameController/GameController.h>
@ -60,7 +62,7 @@ static id disconnectObserver = nil;
* they are only ever used indirectly through objc_msgSend * they are only ever used indirectly through objc_msgSend
*/ */
@interface GCController (SDL) @interface GCController (SDL)
#if !TARGET_OS_IOS && (__MAC_OS_X_VERSION_MAX_ALLOWED <= 101600) #if defined(__MACOSX__) && (__MAC_OS_X_VERSION_MAX_ALLOWED <= 101600)
+ (BOOL)supportsHIDDevice:(IOHIDDeviceRef)device; + (BOOL)supportsHIDDevice:(IOHIDDeviceRef)device;
#endif #endif
@end @end
@ -466,13 +468,8 @@ SDL_AppleTVRemoteRotationHintChanged(void *udata, const char *name, const char *
} }
#endif /* TARGET_OS_TV */ #endif /* TARGET_OS_TV */
#if TARGET_OS_IOS #if defined(__MACOSX__)
static inline int is_macos11 (void) static int is_macos11(void)
{
return (@available(macos 11.0, *));
}
#else /* TARGET_OS_OSX */
static inline int is_macos11 (void)
{ {
return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_15); return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_15);
} }
@ -481,7 +478,13 @@ static inline int is_macos11 (void)
static int static int
IOS_JoystickInit(void) IOS_JoystickInit(void)
{ {
if (is_macos11()) @autoreleasepool { #if defined(__MACOSX__)
if (!is_macos11()) {
return 0;
}
#endif
@autoreleasepool {
#ifdef SDL_JOYSTICK_iOS_ACCELEROMETER #ifdef SDL_JOYSTICK_iOS_ACCELEROMETER
if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_TRUE)) { if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_TRUE)) {
/* Default behavior, accelerometer as joystick */ /* Default behavior, accelerometer as joystick */
@ -1378,7 +1381,7 @@ IOS_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
return SDL_FALSE; return SDL_FALSE;
} }
#if defined(SDL_JOYSTICK_MFI) && !TARGET_OS_IOS #if defined(SDL_JOYSTICK_MFI) && defined(__MACOSX__)
SDL_bool IOS_SupportedHIDDevice(IOHIDDeviceRef device) SDL_bool IOS_SupportedHIDDevice(IOHIDDeviceRef device)
{ {
if (is_macos11()) { if (is_macos11()) {