geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Sam Lantinga 2020-05-27 10:35:43 -07:00
parent 57149c2410
commit 1a1f1704a2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -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/iphoneos/*.m"
SOURCES="$SOURCES $srcdir/src/joystick/steam/*.c" SOURCES="$SOURCES $srcdir/src/joystick/steam/*.c"
have_joystick=yes have_joystick=yes
else
# Need this code for accelerometer as joystick support
SOURCES="$SOURCES $srcdir/src/joystick/iphoneos/*.m"
fi fi
# Set up files for the haptic library # Set up files for the haptic library
#if test x$enable_haptic = xyes; then #if test x$enable_haptic = xyes; then

2
src/joystick/SDL_joystick.c
View File

@ -70,7 +70,7 @@ static SDL_JoystickDriver *SDL_joystick_drivers[] = {
#ifdef SDL_JOYSTICK_IOKIT #ifdef SDL_JOYSTICK_IOKIT
&SDL_DARWIN_JoystickDriver, &SDL_DARWIN_JoystickDriver,
#endif #endif
#if defined(__IPHONEOS__) || defined(__TVOS__) #if (defined(__IPHONEOS__) || defined(__TVOS__)) && !defined(SDL_JOYSTICK_DISABLED)
&SDL_IOS_JoystickDriver, &SDL_IOS_JoystickDriver,
#endif #endif
#ifdef SDL_JOYSTICK_ANDROID #ifdef SDL_JOYSTICK_ANDROID