From 9e45372a2f735e7d73adf16608ffdde4b6dc26d8 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 21 Jan 2021 22:47:37 -0800 Subject: [PATCH] Fixed build on Android and iOS --- src/hidapi/SDL_hidapi.c | 2 ++ src/hidapi/SDL_hidapi.h | 6 ++++++ src/joystick/hidapi/SDL_hidapi_gamecube.c | 2 ++ 3 files changed, 10 insertions(+) diff --git a/src/hidapi/SDL_hidapi.c b/src/hidapi/SDL_hidapi.c index 365ebe855..4cffde0d4 100644 --- a/src/hidapi/SDL_hidapi.c +++ b/src/hidapi/SDL_hidapi.c @@ -955,6 +955,7 @@ HID_API_EXPORT const wchar_t* HID_API_CALL hid_error(hid_device *device) return wrapper->backend->hid_error(wrapper->device); } +#ifdef HAVE_ENABLE_GAMECUBE_ADAPTORS /* This is needed to enable input for Nyko and EVORETRO GameCube adaptors */ void SDL_EnableGameCubeAdaptors(void) { @@ -1009,6 +1010,7 @@ void SDL_EnableGameCubeAdaptors(void) } #endif /* SDL_LIBUSB_DYNAMIC */ } +#endif /* HAVE_ENABLE_GAMECUBE_ADAPTORS */ #endif /* SDL_JOYSTICK_HIDAPI */ diff --git a/src/hidapi/SDL_hidapi.h b/src/hidapi/SDL_hidapi.h index 305a00a5c..743539099 100644 --- a/src/hidapi/SDL_hidapi.h +++ b/src/hidapi/SDL_hidapi.h @@ -21,7 +21,13 @@ #ifdef SDL_JOYSTICK_HIDAPI +#ifdef SDL_LIBUSB_DYNAMIC +#define HAVE_ENABLE_GAMECUBE_ADAPTORS +#endif + +#ifdef HAVE_ENABLE_GAMECUBE_ADAPTORS extern void SDL_EnableGameCubeAdaptors(void); +#endif #endif /* SDL_JOYSTICK_HIDAPI */ diff --git a/src/joystick/hidapi/SDL_hidapi_gamecube.c b/src/joystick/hidapi/SDL_hidapi_gamecube.c index 3f275c84b..51e8ba975 100644 --- a/src/joystick/hidapi/SDL_hidapi_gamecube.c +++ b/src/joystick/hidapi/SDL_hidapi_gamecube.c @@ -130,7 +130,9 @@ HIDAPI_DriverGameCube_InitDevice(SDL_HIDAPI_Device *device) Uint8 initMagic = 0x13; Uint8 rumbleMagic = 0x11; +#ifdef HAVE_ENABLE_GAMECUBE_ADAPTORS SDL_EnableGameCubeAdaptors(); +#endif ctx = (SDL_DriverGameCube_Context *)SDL_calloc(1, sizeof(*ctx)); if (!ctx) {