Skip to content
Permalink
Browse files

Moved DirectInput joystick code to 1.3 branch

  • Loading branch information
slouken committed May 21, 2006
1 parent bc90401 commit 8dcb78a68e46189dd03b374455ddcd4274f6b0cc
BIN +0 Bytes (100%) VisualC.zip
Binary file not shown.
@@ -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_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
AC_DEFINE(SDL_JOYSTICK_WINMM)
SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c"
have_joystick=yes
fi
# Set up files for the cdrom library
@@ -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
@@ -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 */

0 comments on commit 8dcb78a

Please sign in to comment.