Mac: patched to compile with haptic subsystem disabled (thanks, Rodrigo!).
authorRyan C. Gordon <icculus@icculus.org>
Tue, 24 Mar 2015 03:24:57 -0400
changeset 94325e8151f59e34
parent 9431 a9c73f29a15e
child 9433 bd062398b648
Mac: patched to compile with haptic subsystem disabled (thanks, Rodrigo!).

Fixes Bugzilla #2717.
src/joystick/darwin/SDL_sysjoystick.c
     1.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Tue Mar 24 03:21:57 2015 -0400
     1.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Tue Mar 24 03:24:57 2015 -0400
     1.3 @@ -412,12 +412,12 @@
     1.4      /* We have to do some storage of the io_service_t for SDL_HapticOpenFromJoystick */
     1.5      if (IOHIDDeviceGetService != NULL) {  /* weak reference: available in 10.6 and later. */
     1.6          const io_service_t ioservice = IOHIDDeviceGetService(ioHIDDeviceObject);
     1.7 +#if SDL_HAPTIC_IOKIT
     1.8          if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK)) {
     1.9              device->ffservice = ioservice;
    1.10 -#if SDL_HAPTIC_IOKIT
    1.11              MacHaptic_MaybeAddDevice(ioservice);
    1.12 +        }
    1.13  #endif
    1.14 -        }
    1.15      }
    1.16  
    1.17      device->send_open_event = 1;