encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed building on FreeBSD 

Alex S

Looks like we have a collision with https://hg.libsdl.org/SDL/rev/cd774daff9f6. (Again, the headers in the base system are intended for drivers and should not be used for compiling non-base applications. At least that's the policy for now: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240964#c19.)
This commit is contained in:
Sam Lantinga 2020-11-24 06:42:53 -08:00
parent feab9d42c1
commit 7a05dbf4b9
3 changed files with 13 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
configure vendored
View File

@ -22712,35 +22712,9 @@ $as_echo "#define SDL_VIDEO_VULKAN 1" >>confdefs.h
CheckInputEvents() CheckInputEvents()
{ {
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux 2.4 unified input interface" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux 2.4 unified input interface" >&5
$as_echo_n "checking for Linux 2.4 unified input interface... " >&6; } $as_echo_n "checking for Linux 2.4 unified input interface... " >&6; }
use_input_events=no use_input_events=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <dev/evdev/input.h>
int
main ()
{
#ifndef EVIOCGNAME
#error EVIOCGNAME() ioctl not available
#endif
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
use_input_events=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$use_input_events = xno; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -22764,16 +22738,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_input_events" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_input_events" >&5
$as_echo "$use_input_events" >&6; } $as_echo "$use_input_events" >&6; }
if test x$use_input_events = xyes; then if test x$use_input_events = xyes; then
$as_echo "#define SDL_INPUT_LINUXEV 1" >>confdefs.h $as_echo "#define SDL_INPUT_LINUXEV 1" >>confdefs.h
SUMMARY_input="${SUMMARY_input} linuxev" SUMMARY_input="${SUMMARY_input} linuxev"
fi fi
} }
CheckInputKD() CheckInputKD()

30
configure.ac
View File

@ -2603,22 +2603,8 @@ dnl See if we can use the new unified event interface in Linux 2.4
CheckInputEvents() CheckInputEvents()
{ {
dnl Check for Linux 2.4 unified input event interface support dnl Check for Linux 2.4 unified input event interface support
AC_MSG_CHECKING(for Linux 2.4 unified input interface) AC_MSG_CHECKING(for Linux 2.4 unified input interface)
use_input_events=no use_input_events=no
dnl FreeBSD puts this in /usr/include/dev/evdev/input.h ...
AC_TRY_COMPILE([
#include <dev/evdev/input.h>
],[
#ifndef EVIOCGNAME
#error EVIOCGNAME() ioctl not available
#endif
],[
use_input_events=yes
])
dnl And Linux of course puts it in linux/input.h ...
if test x$use_input_events = xno; then
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <linux/input.h> #include <linux/input.h>
],[ ],[
@ -2628,13 +2614,11 @@ CheckInputEvents()
],[ ],[
use_input_events=yes use_input_events=yes
]) ])
fi AC_MSG_RESULT($use_input_events)
if test x$use_input_events = xyes; then
AC_MSG_RESULT($use_input_events) AC_DEFINE(SDL_INPUT_LINUXEV, 1, [ ])
if test x$use_input_events = xyes; then SUMMARY_input="${SUMMARY_input} linuxev"
AC_DEFINE(SDL_INPUT_LINUXEV, 1, [ ]) fi
SUMMARY_input="${SUMMARY_input} linuxev"
fi
} }
dnl See if we can use the kernel kd.h header dnl See if we can use the kernel kd.h header

4
src/joystick/linux/SDL_sysjoystick_c.h
View File

@ -22,11 +22,7 @@
#ifndef SDL_sysjoystick_c_h_ #ifndef SDL_sysjoystick_c_h_
#define SDL_sysjoystick_c_h_ #define SDL_sysjoystick_c_h_
#ifdef __linux__
#include <linux/input.h> #include <linux/input.h>
#else /* FreeBSD (and maybe others) */
#include <dev/evdev/input.h>
#endif
struct SDL_joylist_item; struct SDL_joylist_item;