Commit 38ed8a955a10b9420c87421eb85c1b2449f266c0

Sam Lantinga 2020-11-11T19:31:03

Fixed bug 5335 - enable joystick/haptic/evdev support by default on FreeBSD Alex S ...which allows SDL to talk to webcamd/iichid. (Webcamd actually bundles quite a few gamepad drivers.) Note that this does _not_ disable usbhid, both joystick backends will be compiled.

diff --git a/configure b/configure
index 458d379..6675cc2 100755
--- a/configure
+++ b/configure
@@ -24735,7 +24735,7 @@ $as_echo "#define SDL_AUDIO_DRIVER_ANDROID 1" >>confdefs.h
         # Set up files for the joystick library
         if test x$enable_joystick = xyes; then
           case $ARCH in
-            linux)
+            linux|freebsd)
 
 $as_echo "#define SDL_JOYSTICK_LINUX 1" >>confdefs.h
 
@@ -24756,7 +24756,7 @@ $as_echo "#define SDL_JOYSTICK_ANDROID 1" >>confdefs.h
         # Set up files for the haptic library
         if test x$enable_haptic = xyes; then
           case $ARCH in
-            linux)
+            linux|freebsd)
                 if test x$use_input_events = xyes; then
 
 $as_echo "#define SDL_HAPTIC_LINUX 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 550af85..ebc7a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3575,7 +3575,7 @@ case "$host" in
         # Set up files for the joystick library
         if test x$enable_joystick = xyes; then
           case $ARCH in
-            linux)
+            linux|freebsd)
                 AC_DEFINE(SDL_JOYSTICK_LINUX, 1, [ ])
                 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
                 SOURCES="$SOURCES $srcdir/src/joystick/steam/*.c"
@@ -3592,7 +3592,7 @@ case "$host" in
         # Set up files for the haptic library
         if test x$enable_haptic = xyes; then
           case $ARCH in
-            linux)
+            linux|freebsd)
                 if test x$use_input_events = xyes; then
                     AC_DEFINE(SDL_HAPTIC_LINUX, 1, [ ])
                     SOURCES="$SOURCES $srcdir/src/haptic/linux/*.c"