Allow haptic subsystem to build on mac. gsoc2008_force_feedback
authorEdgar Simo <bobbens@gmail.com>
Tue, 22 Jul 2008 10:58:27 +0000
branchgsoc2008_force_feedback
changeset 25450e63e7e4a986
parent 2544 2a61a38dd138
child 2546 daf40497dcd4
Allow haptic subsystem to build on mac.
configure.in
include/SDL_config.h.in
     1.1 --- a/configure.in	Tue Jul 22 10:51:24 2008 +0000
     1.2 +++ b/configure.in	Tue Jul 22 10:58:27 2008 +0000
     1.3 @@ -2472,6 +2472,13 @@
     1.4              SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
     1.5              have_joystick=yes
     1.6          fi
     1.7 +        # Set up files for the haptic library
     1.8 +        if test x$enable_haptic = xyes; then
     1.9 +            AC_DEFINE(SDL_HAPTIC_IOKIT)
    1.10 +            SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c"
    1.11 +            have_haptic=yes
    1.12 +            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback"
    1.13 +        fi
    1.14          # Set up files for the cdrom library
    1.15          if test x$enable_cdrom = xyes; then
    1.16              AC_DEFINE(SDL_CDROM_MACOSX)
     2.1 --- a/include/SDL_config.h.in	Tue Jul 22 10:51:24 2008 +0000
     2.2 +++ b/include/SDL_config.h.in	Tue Jul 22 10:58:27 2008 +0000
     2.3 @@ -218,6 +218,7 @@
     2.4  #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
     2.5  #undef SDL_HAPTIC_DUMMY
     2.6  #undef SDL_HAPTIC_LINUX
     2.7 +#undef SDL_HAPTIC_IOKIT
     2.8  
     2.9  /* Enable various shared object loading systems */
    2.10  #undef SDL_LOADSO_BEOS