Don't build iOS mouse support on Apple TV

libsdl-org · Apr 13, 2020 · cab1ee9 · cab1ee9
1 parent e5d3629
commit cab1ee9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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 <UIPointerInteractionDelegate>
 #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
@@ -76,7 +76,7 @@ - (instancetype)initWithFrame:(CGRect)frame
         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 @@ - (void)setSDLWindow:(SDL_Window *)window
     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 @@ - (UIPointerRegion *)pointerInteraction:(UIPointerInteraction *)interaction regi
     }
     return defaultRegion;
 }
-#endif /* __IPHONE_13_4 */
+#endif /* !TARGET_OS_TV && __IPHONE_13_4 */
 
 - (SDL_TouchDeviceType)touchTypeForTouch:(UITouch *)touch
 {
@@ -210,7 +210,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
     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 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
     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 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
     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 */