1.1 --- a/CMakeLists.txt Mon Dec 10 15:50:42 2012 -0500
1.2 +++ b/CMakeLists.txt Tue Dec 11 11:07:48 2012 -0500
1.3 @@ -205,7 +205,6 @@
1.4 set_option(NAS "Support the NAS audio API" ${UNIX_SYS})
1.5 set_option(RPATH "Use an rpath when linking SDL" ${UNIX_SYS})
1.6 set_option(CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" OFF)
1.7 -set_option(INPUT_EVENTS "Use Linux 2.4 unified input interface" ${LINUX})
1.8 set_option(INPUT_TSLIB "Use the Touchscreen library for input" ${UNIX_SYS})
1.9 set_option(VIDEO_X11 "Use X11 video driver" ${UNIX_SYS})
1.10 dep_option(X11_SHARED "Dynamically load X11 support" ON "VIDEO_X11" OFF)
1.11 @@ -632,7 +631,7 @@
1.12 CheckOpenGLESX11()
1.13 endif(SDL_VIDEO)
1.14
1.15 - if(INPUT_EVENTS)
1.16 + if(LINUX)
1.17 check_c_source_compiles("
1.18 #include <linux/input.h>
1.19 #ifndef EVIOCGNAME
1.20 @@ -642,16 +641,14 @@
1.21 if(HAVE_INPUT_EVENTS)
1.22 set(SDL_INPUT_LINUXEV 1)
1.23 endif(HAVE_INPUT_EVENTS)
1.24 - endif(INPUT_EVENTS)
1.25
1.26 - if(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
1.27 - if(LINUX)
1.28 + if(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
1.29 set(SDL_HAPTIC_LINUX 1)
1.30 file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/linux/*.c)
1.31 set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES})
1.32 set(HAVE_SDL_HAPTIC TRUE)
1.33 - endif(LINUX)
1.34 - endif(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
1.35 + endif(SDL_HAPTIC AND HAVE_INPUT_EVENTS)
1.36 + endif(LINUX
1.37
1.38 if(INPUT_TSLIB)
1.39 check_c_source_compiles("