Enable virtual joystick API by default

This commit is contained in:
Sam Lantinga 2020-04-13 08:13:50 -07:00
parent 8a5ee3faf9
commit ef147d2e29
3 changed files with 17 additions and 37 deletions

25
configure vendored
View File

@ -770,7 +770,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
@ -982,7 +981,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}' docdir='${datarootdir}/doc/${PACKAGE}'
@ -1235,15 +1233,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1381,7 +1370,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
@ -1534,7 +1523,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -1706,7 +1694,7 @@ Optional Features:
number to use for magic foregrounding signal or 'no' number to use for magic foregrounding signal or 'no'
[[default=no]] [[default=no]]
--enable-joystick-virtual --enable-joystick-virtual
enable virtual joystick APIs [[default=no]] enable virtual joystick APIs [[default=yes]]
--enable-render-d3d enable the Direct3D render driver [[default=yes]] --enable-render-d3d enable the Direct3D render driver [[default=yes]]
--enable-sdl2-config Install sdl2-config [default=yes] --enable-sdl2-config Install sdl2-config [default=yes]
@ -19505,6 +19493,7 @@ $as_echo "$have_arm_simd" >&6; }
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
if test x$have_arm_simd = xyes; then if test x$have_arm_simd = xyes; then
$as_echo "#define SDL_ARM_SIMD_BLITTERS 1" >>confdefs.h $as_echo "#define SDL_ARM_SIMD_BLITTERS 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-simd*.S" SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-simd*.S"
@ -19556,6 +19545,7 @@ $as_echo "$have_arm_neon" >&6; }
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
if test x$have_arm_neon = xyes; then if test x$have_arm_neon = xyes; then
$as_echo "#define SDL_ARM_NEON_BLITTERS 1" >>confdefs.h $as_echo "#define SDL_ARM_NEON_BLITTERS 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-neon*.S" SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-neon*.S"
@ -21296,6 +21286,7 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
have_xinput2_multitouch=yes have_xinput2_multitouch=yes
$as_echo "#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1" >>confdefs.h $as_echo "#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1" >>confdefs.h
SUMMARY_video_x11="${SUMMARY_video_x11} xinput2_multitouch" SUMMARY_video_x11="${SUMMARY_video_x11} xinput2_multitouch"
@ -23817,6 +23808,7 @@ fi
if test x$have_wasapi = xyes; then if test x$have_wasapi = xyes; then
$as_echo "#define HAVE_MMDEVICEAPI_H 1" >>confdefs.h $as_echo "#define HAVE_MMDEVICEAPI_H 1" >>confdefs.h
fi fi
@ -23829,6 +23821,7 @@ fi
if test x$have_wasapi = xyes; then if test x$have_wasapi = xyes; then
$as_echo "#define HAVE_AUDIOCLIENT_H 1" >>confdefs.h $as_echo "#define HAVE_AUDIOCLIENT_H 1" >>confdefs.h
fi fi
@ -24648,7 +24641,7 @@ CheckVirtualJoystick()
if test "${enable_joystick_virtual+set}" = set; then : if test "${enable_joystick_virtual+set}" = set; then :
enableval=$enable_joystick_virtual; enableval=$enable_joystick_virtual;
else else
enable_joystick_virtual=no enable_joystick_virtual=yes
fi fi
if test x$enable_joystick = xyes -a x$enable_joystick_virtual = xyes; then if test x$enable_joystick = xyes -a x$enable_joystick_virtual = xyes; then
@ -24661,7 +24654,6 @@ $as_echo "#define SDL_JOYSTICK_VIRTUAL 1" >>confdefs.h
} }
CheckWarnAll CheckWarnAll
CheckNoStrictAliasing CheckNoStrictAliasing
@ -25759,6 +25751,7 @@ fi
cat >Makefile.rules <<__EOF__ cat >Makefile.rules <<__EOF__
# Build rules for objects # Build rules for objects

View File

@ -3422,8 +3422,8 @@ dnl Set up the Virtual joystick driver.
CheckVirtualJoystick() CheckVirtualJoystick()
{ {
AC_ARG_ENABLE(joystick-virtual, AC_ARG_ENABLE(joystick-virtual,
AS_HELP_STRING([--enable-joystick-virtual], [enable virtual joystick APIs [[default=no]]]), AS_HELP_STRING([--enable-joystick-virtual], [enable virtual joystick APIs [[default=yes]]]),
, enable_joystick_virtual=no) , enable_joystick_virtual=yes)
if test x$enable_joystick = xyes -a x$enable_joystick_virtual = xyes; then if test x$enable_joystick = xyes -a x$enable_joystick_virtual = xyes; then
AC_DEFINE(SDL_JOYSTICK_VIRTUAL, 1, [ ]) AC_DEFINE(SDL_JOYSTICK_VIRTUAL, 1, [ ])
SOURCES="$SOURCES $srcdir/src/joystick/virtual/*.c" SOURCES="$SOURCES $srcdir/src/joystick/virtual/*.c"
@ -3432,7 +3432,6 @@ AS_HELP_STRING([--enable-joystick-virtual], [enable virtual joystick APIs [[defa
} }
dnl Do this on all platforms, before everything else (other things might want to override it). dnl Do this on all platforms, before everything else (other things might want to override it).
CheckWarnAll CheckWarnAll
CheckNoStrictAliasing CheckNoStrictAliasing

14
test/configure vendored
View File

@ -640,7 +640,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
@ -721,7 +720,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}' docdir='${datarootdir}/doc/${PACKAGE}'
@ -974,15 +972,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1120,7 +1109,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
@ -1273,7 +1262,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]