mirror of https://github.com/encounter/SDL.git
remove non-existing tslib support from autofoo and cmake
This commit is contained in:
Ozkan Sezer
parent
fd89446782
commit
4c96faee57
|
|
@ -361,7 +361,6 @@ set_option(LIBSAMPLERATE "Use libsamplerate for audio rate conversion" ${U
|
|||
dep_option(LIBSAMPLERATE_SHARED "Dynamically load libsamplerate" ON "LIBSAMPLERATE" OFF)
|
||||
set_option(RPATH "Use an rpath when linking SDL" ${UNIX_SYS})
|
||||
set_option(CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" OFF)
|
||||
set_option(INPUT_TSLIB "Use the Touchscreen library for input" ${UNIX_SYS})
|
||||
set_option(VIDEO_X11 "Use X11 video driver" ${UNIX_SYS})
|
||||
set_option(VIDEO_WAYLAND "Use Wayland video driver" ${UNIX_SYS})
|
||||
dep_option(WAYLAND_SHARED "Dynamically load Wayland support" ON "VIDEO_WAYLAND" OFF)
|
||||
|
|
@ -1272,16 +1271,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS)
|
|||
# src/core/unix/*.c is included in a generic if(UNIX) section, elsewhere.
|
||||
endif()
|
||||
|
||||
if(INPUT_TSLIB)
|
||||
check_c_source_compiles("
|
||||
#include \"tslib.h\"
|
||||
int main(int argc, char** argv) { }" HAVE_INPUT_TSLIB)
|
||||
if(HAVE_INPUT_TSLIB)
|
||||
set(SDL_INPUT_TSLIB 1)
|
||||
list(APPEND EXTRA_LIBS ts)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(SDL_JOYSTICK)
|
||||
if(FREEBSD OR NETBSD OR OPENBSD OR BSDI)
|
||||
CheckUSBHID()
|
||||
|
|
|
|||
|
|
@ -888,7 +888,6 @@ enable_dbus
|
|||
enable_ime
|
||||
enable_ibus
|
||||
enable_fcitx
|
||||
enable_input_tslib
|
||||
enable_pthreads
|
||||
enable_pthread_sem
|
||||
enable_directx
|
||||
|
|
@ -1683,8 +1682,6 @@ Optional Features:
|
|||
--enable-ime enable IME support [[default=yes]]
|
||||
--enable-ibus enable IBus support [[default=yes]]
|
||||
--enable-fcitx enable fcitx support [[default=yes]]
|
||||
--enable-input-tslib use the Touchscreen library for input
|
||||
[[default=yes]]
|
||||
--enable-pthreads use POSIX threads for multi-threading
|
||||
[[default=yes]]
|
||||
--enable-pthread-sem use pthread semaphores [[default=yes]]
|
||||
|
|
@ -23148,51 +23145,6 @@ $as_echo "$have_fcitx" >&6; }
|
|||
fi
|
||||
}
|
||||
|
||||
CheckTslib()
|
||||
{
|
||||
# Check whether --enable-input-tslib was given.
|
||||
if test "${enable_input_tslib+set}" = set; then :
|
||||
enableval=$enable_input_tslib;
|
||||
else
|
||||
enable_input_tslib=yes
|
||||
fi
|
||||
|
||||
if test x$enable_input_tslib = xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Touchscreen library support" >&5
|
||||
$as_echo_n "checking for Touchscreen library support... " >&6; }
|
||||
enable_input_tslib=no
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include "tslib.h"
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
|
||||
enable_input_tslib=yes
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_input_tslib" >&5
|
||||
$as_echo "$enable_input_tslib" >&6; }
|
||||
if test x$enable_input_tslib = xyes; then
|
||||
|
||||
$as_echo "#define SDL_INPUT_TSLIB 1" >>confdefs.h
|
||||
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
|
||||
SUMMARY_input="${SUMMARY_input} ts"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
CheckPTHREAD()
|
||||
{
|
||||
# Check whether --enable-pthreads was given.
|
||||
|
|
@ -24725,7 +24677,6 @@ case "$host" in
|
|||
CheckInputKBIO
|
||||
;;
|
||||
esac
|
||||
CheckTslib
|
||||
CheckUSBHID
|
||||
CheckHIDAPI
|
||||
CheckPTHREAD
|
||||
|
|
|
|||
25
configure.ac
25
configure.ac
|
|
@ -2780,30 +2780,6 @@ AS_HELP_STRING([--enable-fcitx], [enable fcitx support [[default=yes]]]),
|
|||
fi
|
||||
}
|
||||
|
||||
dnl See if we can use the Touchscreen input library
|
||||
CheckTslib()
|
||||
{
|
||||
AC_ARG_ENABLE(input-tslib,
|
||||
AS_HELP_STRING([--enable-input-tslib], [use the Touchscreen library for input [[default=yes]]]),
|
||||
, enable_input_tslib=yes)
|
||||
if test x$enable_input_tslib = xyes; then
|
||||
AC_MSG_CHECKING(for Touchscreen library support)
|
||||
enable_input_tslib=no
|
||||
AC_TRY_COMPILE([
|
||||
#include "tslib.h"
|
||||
],[
|
||||
],[
|
||||
enable_input_tslib=yes
|
||||
])
|
||||
AC_MSG_RESULT($enable_input_tslib)
|
||||
if test x$enable_input_tslib = xyes; then
|
||||
AC_DEFINE(SDL_INPUT_TSLIB, 1, [ ])
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
|
||||
SUMMARY_input="${SUMMARY_input} ts"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
dnl See what type of thread model to use on Linux and Solaris
|
||||
CheckPTHREAD()
|
||||
{
|
||||
|
|
@ -3549,7 +3525,6 @@ case "$host" in
|
|||
CheckInputKBIO
|
||||
;;
|
||||
esac
|
||||
CheckTslib
|
||||
CheckUSBHID
|
||||
CheckHIDAPI
|
||||
CheckPTHREAD
|
||||
|
|
|
|||
|
|
@ -282,7 +282,6 @@
|
|||
/* Enable various input drivers */
|
||||
#cmakedefine SDL_INPUT_LINUXEV @SDL_INPUT_LINUXEV@
|
||||
#cmakedefine SDL_INPUT_LINUXKD @SDL_INPUT_LINUXKD@
|
||||
#cmakedefine SDL_INPUT_TSLIB @SDL_INPUT_TSLIB@
|
||||
#cmakedefine SDL_JOYSTICK_ANDROID @SDL_JOYSTICK_ANDROID@
|
||||
#cmakedefine SDL_JOYSTICK_HAIKU @SDL_JOYSTICK_HAIKU@
|
||||
#cmakedefine SDL_JOYSTICK_DINPUT @SDL_JOYSTICK_DINPUT@
|
||||
|
|
|
|||
|
|
@ -283,7 +283,6 @@
|
|||
#undef SDL_INPUT_LINUXEV
|
||||
#undef SDL_INPUT_FBSDKBIO
|
||||
#undef SDL_INPUT_LINUXKD
|
||||
#undef SDL_INPUT_TSLIB
|
||||
#undef SDL_JOYSTICK_HAIKU
|
||||
#undef SDL_JOYSTICK_DINPUT
|
||||
#undef SDL_JOYSTICK_XINPUT
|
||||
|
|
|
|||
|
|
@ -112,7 +112,6 @@
|
|||
#define SDL_AUDIO_DRIVER_OSS 1
|
||||
|
||||
#define SDL_INPUT_LINUXEV 1
|
||||
#define SDL_INPUT_TSLIB 1
|
||||
#define SDL_JOYSTICK_LINUX 1
|
||||
#define SDL_JOYSTICK_VIRTUAL 1
|
||||
#define SDL_HAPTIC_LINUX 1
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@
|
|||
#define SDL_AUDIO_DRIVER_OSS 1
|
||||
|
||||
#define SDL_INPUT_LINUXEV 1
|
||||
#define SDL_INPUT_TSLIB 1
|
||||
#define SDL_JOYSTICK_LINUX 1
|
||||
#define SDL_JOYSTICK_VIRTUAL 1
|
||||
#define SDL_HAPTIC_LINUX 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue