encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed building with --disable-joystick on macOS

This commit is contained in:
Sam Lantinga 2020-05-27 09:57:26 -07:00
parent af5eb56c76
commit 03a7abf80c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/haptic/darwin/SDL_syshaptic.c
View File

@ -599,12 +599,14 @@ SDL_SYS_HapticMouse(void)
int int
SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick) SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
{ {
#ifdef SDL_JOYSTICK_IOKIT
if (joystick->driver != &SDL_DARWIN_JoystickDriver) { if (joystick->driver != &SDL_DARWIN_JoystickDriver) {
return SDL_FALSE; return SDL_FALSE;
} }
if (joystick->hwdata->ffservice != 0) { if (joystick->hwdata->ffservice != 0) {
return SDL_TRUE; return SDL_TRUE;
} }
#endif
return SDL_FALSE; return SDL_FALSE;
} }
@ -615,6 +617,7 @@ SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
int int
SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick) SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
{ {
#ifdef SDL_JOYSTICK_IOKIT
if (joystick->driver != &SDL_DARWIN_JoystickDriver) { if (joystick->driver != &SDL_DARWIN_JoystickDriver) {
return 0; return 0;
} }
@ -622,6 +625,7 @@ SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
joystick->hwdata->ffservice)) { joystick->hwdata->ffservice)) {
return 1; return 1;
} }
#endif
return 0; return 0;
} }
@ -632,6 +636,7 @@ SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
int int
SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick) SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
{ {
#ifdef SDL_JOYSTICK_IOKIT
int device_index = 0; int device_index = 0;
SDL_hapticlist_item *item; SDL_hapticlist_item *item;
@ -648,6 +653,9 @@ SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
} }
return SDL_SYS_HapticOpenFromService(haptic, joystick->hwdata->ffservice); return SDL_SYS_HapticOpenFromService(haptic, joystick->hwdata->ffservice);
#else
return -1;
#endif
} }