Closed bug #74

Added DirectInput joystick code, contributed by Glenn Maynard. This fixes a problem with the Windows Multimedia joystick driver not showing all 6 axes on a GameCube controller converter, which was donated by Jacob Kolding.
libsdl-org · May 21, 2006 · bc9040101b43600c9536b06492c76c2321e93829 · bc90401
1 parent 59b3bfa
commit bc9040101b43600c9536b06492c76c2321e93829
Unified Split

Showing with 630 additions and 112 deletions.

BIN VisualC.zip

+7 −2 configure.in

+1 −0 include/SDL_config.h.in

+1 −1 include/SDL_config_win32.h

+513 −0 src/joystick/win32/SDL_dxjoystick.c

+76 −79 src/video/windx5/SDL_dx5video.c

+32 −30 test/testjoystick.c
diff --git a/VisualC.zip b/VisualC.zip
diff --git a/configure.in b/configure.in
@@ -2270,8 +2270,13 @@ case "$host" in
         fi
         # Set up files for the joystick library
         if test x$enable_joystick = xyes; then
-            AC_DEFINE(SDL_JOYSTICK_WINMM)
-            SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c"
+            if test x$have_directx = xyes; then
+                AC_DEFINE(SDL_JOYSTICK_DINPUT)
+                SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
+            else
+                AC_DEFINE(SDL_JOYSTICK_WINMM)
+                SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"
+            fi
             have_joystick=yes
         fi
         # Set up files for the cdrom library

diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
@@ -198,6 +198,7 @@
 #undef SDL_JOYSTICK_AMIGA
 #undef SDL_JOYSTICK_BEOS
 #undef SDL_JOYSTICK_DC
+#undef SDL_JOYSTICK_DINPUT
 #undef SDL_JOYSTICK_DUMMY
 #undef SDL_JOYSTICK_IOKIT
 #undef SDL_JOYSTICK_LINUX

diff --git a/include/SDL_config_win32.h b/include/SDL_config_win32.h
@@ -131,7 +131,7 @@ typedef unsigned int uintptr_t;
 #ifdef _WIN32_WCE
 #define SDL_JOYSTICK_DISABLED   1
 #else
-#define SDL_JOYSTICK_WINMM	1
+#define SDL_JOYSTICK_DINPUT	1
 #endif
 
 /* Enable various shared object loading systems */