From 57149c2410e774c7c399944ae2682e41a4d2fafa Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 27 May 2020 10:27:20 -0700 Subject: [PATCH] Fixed building with --disable-joystick on iOS --- src/video/uikit/SDL_uikitview.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m index b9ecfed3b..b46e183d4 100644 --- a/src/video/uikit/SDL_uikitview.m +++ b/src/video/uikit/SDL_uikitview.m @@ -37,7 +37,9 @@ #define MAX_MOUSE_BUTTONS 5 /* This is defined in SDL_sysjoystick.m */ +#if !SDL_JOYSTICK_DISABLED extern int SDL_AppleTVRemoteOpenedAsJoystick; +#endif @implementation SDL_uikitview { SDL_Window *sdlwindow; @@ -374,6 +376,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; } #endif +#if !SDL_JOYSTICK_DISABLED /* Presses from Apple TV remote */ if (!SDL_AppleTVRemoteOpenedAsJoystick) { switch (press.type) { @@ -398,6 +401,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; break; } } +#endif /* !SDL_JOYSTICK_DISABLED */ return SDL_SCANCODE_UNKNOWN; } @@ -465,6 +469,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; { /* Swipe gestures don't trigger begin states. */ if (gesture.state == UIGestureRecognizerStateEnded) { +#if !SDL_JOYSTICK_DISABLED if (!SDL_AppleTVRemoteOpenedAsJoystick) { /* Send arrow key presses for now, as we don't have an external API * which better maps to swipe gestures. */ @@ -483,6 +488,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; break; } } +#endif /* !SDL_JOYSTICK_DISABLED */ } } #endif /* TARGET_OS_TV */