Configure should try to use haptic on windows with directinput. gsoc2008_force_feedback
authorEdgar Simo <bobbens@gmail.com>
Thu, 31 Jul 2008 11:10:52 +0000
branchgsoc2008_force_feedback
changeset 2567d551e29f086b
parent 2566 94ff09afa478
child 2568 5ad98a77bacb
Configure should try to use haptic on windows with directinput.
configure.in
include/SDL_config.h.in
include/SDL_config_win32.h
     1.1 --- a/configure.in	Thu Jul 31 11:06:16 2008 +0000
     1.2 +++ b/configure.in	Thu Jul 31 11:10:52 2008 +0000
     1.3 @@ -2331,6 +2331,13 @@
     1.4              fi
     1.5              have_joystick=yes
     1.6          fi
     1.7 +        if test x$enable_haptic = xyes; then
     1.8 +            if test x$have_dinput = xyes; then
     1.9 +                AC_DEFINE(SDL_HAPTIC_DINPUT)
    1.10 +                SOURCES="$SOURCES $srcdir/src/haptic/win32/SDL_syshaptic.c"
    1.11 +                have_haptic=yes
    1.12 +            fi
    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_WIN32)
     2.1 --- a/include/SDL_config.h.in	Thu Jul 31 11:06:16 2008 +0000
     2.2 +++ b/include/SDL_config.h.in	Thu Jul 31 11:10:52 2008 +0000
     2.3 @@ -219,6 +219,7 @@
     2.4  #undef SDL_HAPTIC_DUMMY
     2.5  #undef SDL_HAPTIC_LINUX
     2.6  #undef SDL_HAPTIC_IOKIT
     2.7 +#undef SDL_HAPTIC_DINPUT
     2.8  
     2.9  /* Enable various shared object loading systems */
    2.10  #undef SDL_LOADSO_BEOS
     3.1 --- a/include/SDL_config_win32.h	Thu Jul 31 11:06:16 2008 +0000
     3.2 +++ b/include/SDL_config_win32.h	Thu Jul 31 11:10:52 2008 +0000
     3.3 @@ -141,8 +141,8 @@
     3.4  #define SDL_JOYSTICK_DISABLED   1
     3.5  #define SDL_HAPTIC_DUMMY	1
     3.6  #else
     3.7 -#define SDL_JOYSTICK_WINMM	1
     3.8 -#define SDL_HAPTIC_DUMMY	1
     3.9 +#define SDL_JOYSTICK_DINPUT   1
    3.10 +#define SDL_HAPTIC_DINPUT	1
    3.11  #endif
    3.12  
    3.13  /* Enable various shared object loading systems */