diff options
author | Garrett Brown <garbearucla@gmail.com> | 2014-12-13 03:38:16 -0800 |
---|---|---|
committer | Garrett Brown <themagnificentmrb@gmail.com> | 2016-03-10 17:11:57 -0800 |
commit | bbbc903eeb47d2ad70f2d23eccf88d7ee6930eee (patch) | |
tree | a08bba2afa012588d875733b6d70954dbbe45d1a /configure.ac | |
parent | 44ecc296919d5ab590c5b1471bca808ac0f57c0b (diff) |
Remove joystick code
Joystick support will return in a following commit. Platform specific code
will be isolated entirely in binary add-ons.
Removal of joystick code is incomplete on Android (todo)
Thanks to Tolriq for fixing broken EventServer.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index e30ff3cb8b..9584286c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -296,12 +296,6 @@ AC_ARG_ENABLE([profiling], [use_profiling=$enableval], [use_profiling=no]) -AC_ARG_ENABLE([joystick], - [AS_HELP_STRING([--enable-joystick], - [enable SDL joystick support (default is auto)])], - [use_joystick=$enableval], - [use_joystick=auto]) - AC_ARG_ENABLE([x11], [AS_HELP_STRING([--enable-x11], [enable x11 (default is yes) 'Linux Only'])], @@ -537,7 +531,6 @@ case $host in ARCH="i486-linux" use_arch="x86" use_cpu="i686" - use_joystick=no use_gles=yes use_optical_drive=no use_x11=no @@ -590,7 +583,6 @@ case $host in ;; arm-apple-darwin*) CORE_SYSTEM_NAME=ios - use_joystick=no use_neon=yes use_libcec=no use_vtbdecoder=yes @@ -610,7 +602,6 @@ case $host in ;; *86*-apple-darwin*) CORE_SYSTEM_NAME=osx - use_joystick=no use_vtbdecoder=no ARCH="x86-osx" DEPENDS_ROOT_FOR_XCODE=$(echo ${prefix%/*}) @@ -618,7 +609,6 @@ case $host in ;; powerpc-apple-darwin*) CORE_SYSTEM_NAME=osx - use_joystick=no use_vtbdecoder=no ARCH="powerpc-osx" use_arch="ppc" @@ -638,7 +628,6 @@ case $host in CORE_SYSTEM_NAME=linux ARCH="arm" use_arch="arm" - use_joystick=no use_neon=yes use_gles=yes use_gl=no @@ -650,7 +639,6 @@ case $host in use_arch="arm" use_cpu=cortex-a9 ARCH="arm" - use_joystick=no use_neon=yes use_gles=yes use_optical_drive=no @@ -1180,23 +1168,6 @@ if test "x$use_dbus" != "xno"; then else AC_MSG_NOTICE($dbus_disabled) fi - #case "$host_vendor" != "apple"; determine availability of SDL or SDL2 - # joystick - if test "$use_joystick" != "no"; then - PKG_CHECK_MODULES([SDL2], [sdl2], - [AC_DEFINE([HAVE_SDL_VERSION],[2],["SDL major version"]) - AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"]) - INCLUDES="$INCLUDES $SDL2_CFLAGS"; LIBS="$LIBS $SDL2_LIBS"; use_joystick="yes"], - [if test "$use_joystick" = "yes"; then - AC_MSG_ERROR($sdl_joystick_not_found) - elif test "$use_joystick" != "no"; then - AC_MSG_NOTICE($sdl_joystick_not_found) - use_joystick="no" - fi - ]) - else - AC_MSG_RESULT($sdl_joystick_not_found) - fi fi XB_FIND_SONAME([ASS], [ass]) @@ -1934,13 +1905,6 @@ else final_message="$final_message\n OpenMax:\tNo" fi -if test "$use_joystick" = "yes"; then - final_message="$final_message\n Joystick:\tYes" - AC_DEFINE([HAS_SDL_JOYSTICK],[1],["Define to 1 if using SDL joystick"]) -else - final_message="$final_message\n Joystick:\tNo" -fi - if test "$use_x11" = "yes"; then USE_X11=1 final_message="$final_message\n X11:\t\tYes" |