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 3890636320238bc8
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
     1.1 --- a/configure.in	Sun Oct 29 04:08:50 2006 +0000
     1.2 +++ b/configure.in	Fri Nov 03 21:52:54 2006 +0000
     1.3 @@ -2564,11 +2564,12 @@
     1.4  esac
     1.5  
     1.6  # Verify that we have all the platform specific files we need
     1.7 -if test x$have_joystick != xyes; then
     1.8 -    if test x$enable_joystick = xyes; then
     1.9 -        AC_DEFINE(SDL_JOYSTICK_DISABLED)
    1.10 -    fi
    1.11 +
    1.12 +if test x$enable_joystick = xyes; then
    1.13 +  if test x$have_joystick != xyes; then
    1.14 +    # Wants joystick subsystem, but doesn't have a platform-specific backend...
    1.15      SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
    1.16 +  fi
    1.17  fi
    1.18  if test x$have_cdrom != xyes; then
    1.19      if test x$enable_cdrom = xyes; then