Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Removed old Linux joystick API (/dev/js*).
The newer API (/dev/input/event/*) is 12+ years old at this point, and has
 been available since Linux 2.4.
  • Loading branch information
icculus committed Dec 11, 2012
1 parent 271e884 commit 1d4d895b4cd74cc50874d26f21b0fedf2a3d5b5d
Showing with 18 additions and 215 deletions.
  1. +4 −7 CMakeLists.txt
  2. +0 −5 configure.in
  3. +14 −203 src/joystick/linux/SDL_sysjoystick.c
@@ -205,7 +205,6 @@ dep_option(ARTS_SHARED "Dynamically load aRts audio support" ON "ARTS" O
set_option(NAS "Support the NAS audio API" ${UNIX_SYS})
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_EVENTS "Use Linux 2.4 unified input interface" ${LINUX})
set_option(INPUT_TSLIB "Use the Touchscreen library for input" ${UNIX_SYS})
set_option(VIDEO_X11 "Use X11 video driver" ${UNIX_SYS})
dep_option(X11_SHARED "Dynamically load X11 support" ON "VIDEO_X11" OFF)
@@ -632,7 +631,7 @@ if(UNIX AND NOT APPLE)
CheckOpenGLESX11()
endif(SDL_VIDEO)

if(INPUT_EVENTS)
if(LINUX)
check_c_source_compiles("
#include <linux/input.h>
#ifndef EVIOCGNAME
@@ -642,16 +641,14 @@ if(UNIX AND NOT APPLE)
if(HAVE_INPUT_EVENTS)
set(SDL_INPUT_LINUXEV 1)
endif(HAVE_INPUT_EVENTS)
endif(INPUT_EVENTS)

if(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
if(LINUX)
if(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
set(SDL_HAPTIC_LINUX 1)
file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/linux/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES})
set(HAVE_SDL_HAPTIC TRUE)
endif(LINUX)
endif(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
endif(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
endif(LINUX

if(INPUT_TSLIB)
check_c_source_compiles("
@@ -1650,10 +1650,6 @@ dnl See if we can use the new unified event interface in Linux 2.4
CheckInputEvents()
{
dnl Check for Linux 2.4 unified input event interface support
AC_ARG_ENABLE(input-events,
AC_HELP_STRING([--enable-input-events], [use Linux 2.4 unified input interface [[default=yes]]]),
, enable_input_events=yes)
if test x$enable_input_events = xyes; then
AC_MSG_CHECKING(for Linux 2.4 unified input interface)
use_input_events=no
AC_TRY_COMPILE([
@@ -1669,7 +1665,6 @@ AC_HELP_STRING([--enable-input-events], [use Linux 2.4 unified input interface [
if test x$use_input_events = xyes; then
AC_DEFINE(SDL_INPUT_LINUXEV, 1, [ ])
fi
fi
}

dnl See if we can use the Touchscreen input library

0 comments on commit 1d4d895

Please sign in to comment.