mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-21 17:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Android always needs a native HIDAPI implementation

Browse Source 
(cherry picked from commit 89eef1bd34)
This commit is contained in:
Anonymous Maarten
2025-06-26 23:38:12 +02:00
committed by Sam Lantinga
parent 12b56f5447
commit 08ebeaee5c
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1336,9 +1336,7 @@ if(ANDROID)
set(HAVE_SDL_HAPTIC TRUE) set(HAVE_SDL_HAPTIC TRUE)
endif() endif()
if(SDL_HIDAPI)
CheckHIDAPI() CheckHIDAPI()
endif()
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
set(SDL_JOYSTICK_ANDROID 1) set(SDL_JOYSTICK_ANDROID 1)

16
cmake/sdlchecks.cmake
View File

@@ -1077,6 +1077,14 @@ endmacro()
# Check for HIDAPI support # Check for HIDAPI support
macro(CheckHIDAPI) macro(CheckHIDAPI)
if(ANDROID)
enable_language(CXX)
sdl_sources("${SDL3_SOURCE_DIR}/src/hidapi/android/hid.cpp")
endif()
if(IOS OR TVOS)
sdl_sources("${SDL3_SOURCE_DIR}/src/hidapi/ios/hid.m")
set(SDL_FRAMEWORK_COREBLUETOOTH 1)
endif()
if(SDL_HIDAPI) if(SDL_HIDAPI)
set(HAVE_HIDAPI ON) set(HAVE_HIDAPI ON)
if(SDL_HIDAPI_LIBUSB) if(SDL_HIDAPI_LIBUSB)
@@ -1109,14 +1117,6 @@ macro(CheckHIDAPI)
endif() endif()
if(HAVE_HIDAPI) if(HAVE_HIDAPI)
if(ANDROID)
enable_language(CXX)
sdl_sources("${SDL3_SOURCE_DIR}/src/hidapi/android/hid.cpp")
endif()
if(IOS OR TVOS)
sdl_sources("${SDL3_SOURCE_DIR}/src/hidapi/ios/hid.m")
set(SDL_FRAMEWORK_COREBLUETOOTH 1)
endif()
set(HAVE_SDL_HIDAPI TRUE) set(HAVE_SDL_HIDAPI TRUE)
if(SDL_JOYSTICK AND SDL_HIDAPI_JOYSTICK) if(SDL_JOYSTICK AND SDL_HIDAPI_JOYSTICK)