Disable HIDAPI.

Problem one: it requires its own binary, which we haven't built. There
are instructions in sdl/src/hidapi/README.txt, if we ever want to try.

Problem two: the Android app segfaults when `hid_init()` calls
`g_JVM->AttachCurrentThread()`. This might be a bug in NDK 21's jni.h,
but that seems unlikely. Perhaps a version mismatch?

In any case, we aren't using the code at the moment, so the easy answer
is to leave it out.
This commit is contained in:
Joseph Cloutier
2022-05-20 01:00:35 -04:00
parent 31e9ab663d
commit c37e48faaf
2 changed files with 9 additions and 1 deletions

View File

@@ -114,6 +114,8 @@
<compilerflag value="-D__IPHONEOS__" if="ios || tvos" />
<compilerflag value="-D__TVOS__" if="tvos" />
<compilerflag value="-DSDL_HIDAPI_DISABLED" />
<section if="windows">
<compilerflag value="-DNATIVE_TOOLKIT_SDL_ANGLE" if="NATIVE_TOOLKIT_SDL_ANGLE" />
@@ -202,6 +204,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_gamecontroller.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_joystick.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/virtual/SDL_virtualjoystick.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_atan2.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_exp.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_fmod.c" />
@@ -302,8 +305,11 @@
<section if="windows || mac || ios || android || tvos">
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_luna.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_stadia.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_steam.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_switch.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c" />
@@ -566,6 +572,7 @@
<section if="android">
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/aaudio/SDL_aaudio.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/android/SDL_androidaudio.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/openslES/SDL_openslES.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/android/SDL_android.c" />