Don't include the iOS joystick driver if joysticks are disabled

libsdl-org · May 27, 2020 · 1a1f170 · 1a1f170
1 parent 57149c2
commit 1a1f170
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -3902,6 +3902,9 @@ AS_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
             SOURCES="$SOURCES $srcdir/src/joystick/iphoneos/*.m"
             SOURCES="$SOURCES $srcdir/src/joystick/steam/*.c"
             have_joystick=yes
+        else
+            # Need this code for accelerometer as joystick support
+            SOURCES="$SOURCES $srcdir/src/joystick/iphoneos/*.m"
         fi
         # Set up files for the haptic library
         #if test x$enable_haptic = xyes; then

diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
@@ -70,7 +70,7 @@ static SDL_JoystickDriver *SDL_joystick_drivers[] = {
 #ifdef SDL_JOYSTICK_IOKIT
     &SDL_DARWIN_JoystickDriver,
 #endif
-#if defined(__IPHONEOS__) || defined(__TVOS__)
+#if (defined(__IPHONEOS__) || defined(__TVOS__)) && !defined(SDL_JOYSTICK_DISABLED)
     &SDL_IOS_JoystickDriver,
 #endif
 #ifdef SDL_JOYSTICK_ANDROID