encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: don't try to use the Linux joystick code on Android (thanks, Martin!). 

Fixes Bugzilla #3201.
This commit is contained in:
Ryan C. Gordon 2015-12-29 00:24:37 -05:00
parent 7ca3b27064
commit c9927bbb17
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -826,7 +826,7 @@ elseif(UNIX AND NOT APPLE)
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
CheckUSBHID() # seems to be BSD specific - limit the test to BSD only? CheckUSBHID() # seems to be BSD specific - limit the test to BSD only?
if(LINUX) if(LINUX AND NOT ANDROID)
set(SDL_JOYSTICK_LINUX 1) set(SDL_JOYSTICK_LINUX 1)
file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/linux/*.c) file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/linux/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES})