[SVN] r3842 - in branches/gsoc2008_force_feedback: . include

[svn-owner at libsdl.org]

Author: bobbens
Date: 2008-07-31 04:10:52 -0700 (Thu, 31 Jul 2008)
New Revision: 3842

Modified:
   branches/gsoc2008_force_feedback/configure.in
   branches/gsoc2008_force_feedback/include/SDL_config.h.in
   branches/gsoc2008_force_feedback/include/SDL_config_win32.h
Log:
Configure should try to use haptic on windows with directinput.


Modified: branches/gsoc2008_force_feedback/configure.in
===================================================================
--- branches/gsoc2008_force_feedback/configure.in	2008-07-31 11:06:16 UTC (rev 3841)
+++ branches/gsoc2008_force_feedback/configure.in	2008-07-31 11:10:52 UTC (rev 3842)
@@ -2331,6 +2331,13 @@
             fi
             have_joystick=yes
         fi
+        if test x$enable_haptic = xyes; then
+            if test x$have_dinput = xyes; then
+                AC_DEFINE(SDL_HAPTIC_DINPUT)
+                SOURCES="$SOURCES $srcdir/src/haptic/win32/SDL_syshaptic.c"
+                have_haptic=yes
+            fi
+        fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
             AC_DEFINE(SDL_CDROM_WIN32)

Modified: branches/gsoc2008_force_feedback/include/SDL_config.h.in
===================================================================
--- branches/gsoc2008_force_feedback/include/SDL_config.h.in	2008-07-31 11:06:16 UTC (rev 3841)
+++ branches/gsoc2008_force_feedback/include/SDL_config.h.in	2008-07-31 11:10:52 UTC (rev 3842)
@@ -219,6 +219,7 @@
 #undef SDL_HAPTIC_DUMMY
 #undef SDL_HAPTIC_LINUX
 #undef SDL_HAPTIC_IOKIT
+#undef SDL_HAPTIC_DINPUT
 
 /* Enable various shared object loading systems */
 #undef SDL_LOADSO_BEOS

Modified: branches/gsoc2008_force_feedback/include/SDL_config_win32.h
===================================================================
--- branches/gsoc2008_force_feedback/include/SDL_config_win32.h	2008-07-31 11:06:16 UTC (rev 3841)
+++ branches/gsoc2008_force_feedback/include/SDL_config_win32.h	2008-07-31 11:10:52 UTC (rev 3842)
@@ -141,8 +141,8 @@
 #define SDL_JOYSTICK_DISABLED   1
 #define SDL_HAPTIC_DUMMY	1
 #else
-#define SDL_JOYSTICK_WINMM	1
-#define SDL_HAPTIC_DUMMY	1
+#define SDL_JOYSTICK_DINPUT   1
+#define SDL_HAPTIC_DINPUT	1
 #endif
 
 /* Enable various shared object loading systems */