Skip to content

Commit

Permalink
Enable virtual joystick API by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Apr 13, 2020
1 parent 8a5ee3f commit ef147d2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 37 deletions.
35 changes: 14 additions & 21 deletions configure
View file
Expand Up @@ -770,7 +770,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -982,7 +981,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
Expand Down Expand Up @@ -1235,15 +1233,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
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)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1381,7 +1370,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1534,7 +1523,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand Down Expand Up @@ -1706,7 +1694,7 @@ Optional Features:
number to use for magic foregrounding signal or 'no'
[[default=no]]
--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-sdl2-config Install sdl2-config [default=yes]

Expand Down Expand Up @@ -19505,7 +19493,8 @@ $as_echo "$have_arm_simd" >&6; }
CFLAGS="$save_CFLAGS"

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"
WARN_ABOUT_ARM_SIMD_ASM_MIT="yes"
Expand Down Expand Up @@ -19556,7 +19545,8 @@ $as_echo "$have_arm_neon" >&6; }
CFLAGS="$save_CFLAGS"

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"
WARN_ABOUT_ARM_NEON_ASM_MIT="yes"
Expand Down Expand Up @@ -21296,7 +21286,8 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :

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"

Expand Down Expand Up @@ -23817,7 +23808,8 @@ fi


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
ac_fn_c_check_header_mongrel "$LINENO" "audioclient.h" "ac_cv_header_audioclient_h" "$ac_includes_default"
Expand All @@ -23829,7 +23821,8 @@ fi


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

Expand Down Expand Up @@ -24648,7 +24641,7 @@ CheckVirtualJoystick()
if test "${enable_joystick_virtual+set}" = set; then :
enableval=$enable_joystick_virtual;
else
enable_joystick_virtual=no
enable_joystick_virtual=yes
fi

if test x$enable_joystick = xyes -a x$enable_joystick_virtual = xyes; then
Expand All @@ -24661,7 +24654,6 @@ $as_echo "#define SDL_JOYSTICK_VIRTUAL 1" >>confdefs.h
}



CheckWarnAll
CheckNoStrictAliasing

Expand Down Expand Up @@ -25759,6 +25751,7 @@ fi




cat >Makefile.rules <<__EOF__

# Build rules for objects
Expand Down
5 changes: 2 additions & 3 deletions configure.ac
View file
Expand Up @@ -3422,8 +3422,8 @@ dnl Set up the Virtual joystick driver.
CheckVirtualJoystick()
{
AC_ARG_ENABLE(joystick-virtual,
AS_HELP_STRING([--enable-joystick-virtual], [enable virtual joystick APIs [[default=no]]]),
, enable_joystick_virtual=no)
AS_HELP_STRING([--enable-joystick-virtual], [enable virtual joystick APIs [[default=yes]]]),
, enable_joystick_virtual=yes)
if test x$enable_joystick = xyes -a x$enable_joystick_virtual = xyes; then
AC_DEFINE(SDL_JOYSTICK_VIRTUAL, 1, [ ])
SOURCES="$SOURCES $srcdir/src/joystick/virtual/*.c"
Expand All @@ -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).
CheckWarnAll
CheckNoStrictAliasing
Expand Down
14 changes: 1 addition & 13 deletions test/configure
View file
Expand Up @@ -640,7 +640,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -721,7 +720,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
Expand Down Expand Up @@ -974,15 +972,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
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)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1120,7 +1109,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1273,7 +1262,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand Down

0 comments on commit ef147d2

Please sign in to comment.