Moved DirectInput joystick code to 1.3 branch

libsdl-org · May 21, 2006 · 8dcb78a · 8dcb78a
1 parent bc90401
commit 8dcb78a
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 630 deletions.
diff --git a/VisualC.zip b/VisualC.zip
diff --git a/configure.in b/configure.in
@@ -2270,13 +2270,8 @@ case "$host" in
         fi
         # Set up files for the joystick library
         if test x$enable_joystick = xyes; then
-            if test x$have_directx = xyes; then
+            AC_DEFINE(SDL_JOYSTICK_WINMM)
-                AC_DEFINE(SDL_JOYSTICK_DINPUT)
+            SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c"
-                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,7 +198,6 @@
 #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_DINPUT	1
+#define SDL_JOYSTICK_WINMM	1
 #endif
 
 /* Enable various shared object loading systems */