Merged r2896:2897 from trunk (use dummy joystick if subsystem enabled and SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Fri, 03 Nov 2006 21:52:54 +0000
branchSDL-1.2
changeset 3890 636320238bc8
parent 3889 67d518069d9a
child 3891 2b5c30359c1d
Merged r2896:2897 from trunk (use dummy joystick if subsystem enabled and no platform-specific driver exists). Fixes Bugzilla #356 (and maybe Bugzilla #350).
configure.in
--- a/configure.in	Sun Oct 29 04:08:50 2006 +0000
+++ b/configure.in	Fri Nov 03 21:52:54 2006 +0000
@@ -2564,11 +2564,12 @@
 esac
 
 # Verify that we have all the platform specific files we need
-if test x$have_joystick != xyes; then
-    if test x$enable_joystick = xyes; then
-        AC_DEFINE(SDL_JOYSTICK_DISABLED)
-    fi
+
+if test x$enable_joystick = xyes; then
+  if test x$have_joystick != xyes; then
+    # Wants joystick subsystem, but doesn't have a platform-specific backend...
     SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
+  fi
 fi
 if test x$have_cdrom != xyes; then
     if test x$enable_cdrom = xyes; then