From dc764496618723ad109f5453a5ce45187afeec51 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 11 Nov 2020 19:53:10 -0800 Subject: [PATCH] Backed out change for bug 5335 - enable joystick/haptic/evdev support by default on FreeBSD Building on FreeBSD fails: /buildbot/worker/SDL/sdl-freebsd-amd64/src/src/joystick/linux/SDL_sysjoystick.c:26:2: error: SDL now requires a Linux 2.4+ kernel with /dev/input/event support. #error SDL now requires a Linux 2.4+ kernel with /dev/input/event support. ^ /buildbot/worker/SDL/sdl-freebsd-amd64/src/src/joystick/linux/SDL_sysjoystick.c:35:10: fatal error: 'sys/inotify.h' file not found #include ^~~~~~~~~~~~~~~ --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 765d02eb4..e7444da86 100755 --- a/configure +++ b/configure @@ -24777,7 +24777,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|freebsd) + linux) $as_echo "#define SDL_JOYSTICK_LINUX 1" >>confdefs.h @@ -24798,7 +24798,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|freebsd) + linux) if test x$use_input_events = xyes; then $as_echo "#define SDL_HAPTIC_LINUX 1" >>confdefs.h