From e32d719c16cbd487d460aab0944b1548c8ee3ed6 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 29 Mar 2025 12:48:38 +0100 Subject: [PATCH] port: only enable SDL hints on SDL versions that support them --- port/src/input.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/port/src/input.c b/port/src/input.c index ce6f4b5b9..2bacbd646 100644 --- a/port/src/input.c +++ b/port/src/input.c @@ -679,17 +679,30 @@ s32 inputInit(void) { // Set SDL hints before initializing the controller subsystem. if (useHIDAPI) { - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1"); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4, "1"); +#if SDL_VERSION_ATLEAST(2, 0, 12) + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE, "1"); +#endif +#if SDL_VERSION_ATLEAST(2, 0, 14) SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5, "1"); +#endif +#if SDL_VERSION_ATLEAST(2, 0, 22) + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI, "1"); + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1"); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS, "1"); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE, "1"); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_WII, "1"); // the two hints below enable Rumble and Motion Sensor for PS4/5 pads connected via bluetooth SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1"); +#endif +#if SDL_VERSION_ATLEAST(2, 23, 2) + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS, "1"); +#endif +#if SDL_VERSION_ATLEAST(2, 25, 1) + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1"); +#endif +#if SDL_VERSION_ATLEAST(2, 26, 0) + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_WII, "1"); +#endif } if (useRawInput) { SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, "1");