From cab1ee9cbc11a85891717830346203a593e887a6 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 13 Apr 2020 15:57:04 -0700 Subject: [PATCH] Don't build iOS mouse support on Apple TV --- src/video/uikit/SDL_uikitview.h | 4 ++-- src/video/uikit/SDL_uikitview.m | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/video/uikit/SDL_uikitview.h b/src/video/uikit/SDL_uikitview.h index 93bd86236..faad0f8a6 100644 --- a/src/video/uikit/SDL_uikitview.h +++ b/src/video/uikit/SDL_uikitview.h @@ -25,7 +25,7 @@ #include "SDL_touch.h" -#ifdef __IPHONE_13_4 +#if !TARGET_OS_TV && defined(__IPHONE_13_4) @interface SDL_uikitview : UIView #else @interface SDL_uikitview : UIView @@ -35,7 +35,7 @@ - (void)setSDLWindow:(SDL_Window *)window; -#ifdef __IPHONE_13_4 +#if !TARGET_OS_TV && defined(__IPHONE_13_4) - (UIPointerRegion *)pointerInteraction:(UIPointerInteraction *)interaction regionForRequest:(UIPointerRegionRequest *)request defaultRegion:(UIPointerRegion *)defaultRegion API_AVAILABLE(ios(13.4)); #endif diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m index da4c09d28..c28aab889 100644 --- a/src/video/uikit/SDL_uikitview.m +++ b/src/video/uikit/SDL_uikitview.m @@ -76,7 +76,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; SDL_AddTouch(directTouchId, SDL_TOUCH_DEVICE_DIRECT, ""); #endif -#ifdef __IPHONE_13_4 +#if !TARGET_OS_TV && defined(__IPHONE_13_4) if (@available(iOS 13.4, *)) { [self addInteraction:[[UIPointerInteraction alloc] initWithDelegate:self]]; } @@ -142,7 +142,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; sdlwindow = window; } -#ifdef __IPHONE_13_4 +#if !TARGET_OS_TV && defined(__IPHONE_13_4) - (UIPointerRegion *)pointerInteraction:(UIPointerInteraction *)interaction regionForRequest:(UIPointerRegionRequest *)request defaultRegion:(UIPointerRegion *)defaultRegion API_AVAILABLE(ios(13.4)){ if (request != nil) { CGPoint origin = self.bounds.origin; @@ -155,7 +155,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; } return defaultRegion; } -#endif /* __IPHONE_13_4 */ +#endif /* !TARGET_OS_TV && __IPHONE_13_4 */ - (SDL_TouchDeviceType)touchTypeForTouch:(UITouch *)touch { @@ -210,7 +210,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; for (UITouch *touch in touches) { BOOL handled = NO; -#ifdef __IPHONE_13_4 +#if !TARGET_OS_TV && defined(__IPHONE_13_4) if (@available(iOS 13.4, *)) { if (touch.type == UITouchTypeIndirectPointer) { /* FIXME: How can we tell the difference between left and right button clicks? */ @@ -242,7 +242,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; for (UITouch *touch in touches) { BOOL handled = NO; -#ifdef __IPHONE_13_4 +#if !TARGET_OS_TV && defined(__IPHONE_13_4) if (@available(iOS 13.4, *)) { if (touch.type == UITouchTypeIndirectPointer) { /* FIXME: How can we tell the difference between left and right button clicks? */ @@ -279,7 +279,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; for (UITouch *touch in touches) { BOOL handled = NO; -#ifdef __IPHONE_13_4 +#if !TARGET_OS_TV && defined(__IPHONE_13_4) if (@available(iOS 13.4, *)) { if (touch.type == UITouchTypeIndirectPointer) { /* Already handled in pointerInteraction callback */