From 19ed586988ffd4330f8cafd18b5f969535aab357 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 14 Jul 2015 02:42:12 +0000 Subject: [PATCH] SDL2: SDL_JoystickName parameter changed --- common/arch/sdl/joy.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/arch/sdl/joy.cpp b/common/arch/sdl/joy.cpp index e20737cce..278ce291e 100644 --- a/common/arch/sdl/joy.cpp +++ b/common/arch/sdl/joy.cpp @@ -159,7 +159,11 @@ void joy_init() for (int i = 0; i < n; i++) { auto &joystick = SDL_Joysticks[num_joysticks]; const auto handle = joystick.handle = SDL_JoystickOpen(i); +#if SDL_MAJOR_VERSION == 1 con_printf(CON_NORMAL, "sdl-joystick %d: %s", i, SDL_JoystickName(i)); +#else + con_printf(CON_NORMAL, "sdl-joystick %d: %s", i, SDL_JoystickName(handle)); +#endif if (handle) { const auto n_axes = joystick.n_axes = check_warn_joy_support_limit(SDL_JoystickNumAxes(handle), "axe");