# HG changeset patch # User Ryan C. Gordon # Date 1175682494 0 # Node ID 3b5c908891561fb9a748578b4bf20c4afcb96cf7 # Parent cd5b5c52a37e6de550335bb034bc8b9e8c918b3d Don't compile the joystick code if --disable-joystick is specified at ./configure time, and define SDL_JOYSTICK_DUMMY if the subsystem is wanted but there aren't any drivers available for the platform. Fixes Bugzilla #403. diff -r cd5b5c52a37e -r 3b5c90889156 configure.in --- a/configure.in Wed Apr 04 09:40:40 2007 +0000 +++ b/configure.in Wed Apr 04 10:28:14 2007 +0000 @@ -196,7 +196,6 @@ SOURCES="$SOURCES $srcdir/src/cpuinfo/*.c" SOURCES="$SOURCES $srcdir/src/events/*.c" SOURCES="$SOURCES $srcdir/src/file/*.c" -SOURCES="$SOURCES $srcdir/src/joystick/*.c" SOURCES="$SOURCES $srcdir/src/stdlib/*.c" SOURCES="$SOURCES $srcdir/src/thread/*.c" SOURCES="$SOURCES $srcdir/src/timer/*.c" @@ -215,6 +214,8 @@ , enable_video=yes) if test x$enable_video != xyes; then AC_DEFINE(SDL_VIDEO_DISABLED) +else + SOURCES="$SOURCES $srcdir/src/joystick/*.c" fi AC_ARG_ENABLE(events, AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]), @@ -2576,6 +2577,7 @@ 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... + AC_DEFINE(SDL_JOYSTICK_DUMMY) SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" fi fi