From 2892f0330f41025b3d1406d8958063d4e971144e Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Wed, 24 Jul 2019 02:09:08 +0200 Subject: [PATCH] fix call to SDL_JoystickName() with SDL 1.2 SDL 1.2 : const char *SDL_JoystickName(int index); SDL 2.0 : const char* SDL_JoystickName(SDL_Joystick* joystick); --- src/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 55d92a1f..fa3ddfff 100644 --- a/src/main.c +++ b/src/main.c @@ -785,7 +785,12 @@ int Init_program(int argc,char * argv[]) else { GFX2_Log(GFX2_DEBUG, "Joystick #0 open : \"%s\" %d axes, %d buttons, %d balls, %d hats\n", - SDL_JoystickName(Joystick), SDL_JoystickNumAxes(Joystick), +#if defined(USE_SDL2) + SDL_JoystickName(Joystick), +#else + SDL_JoystickName(0), +#endif + SDL_JoystickNumAxes(Joystick), SDL_JoystickNumButtons(Joystick), SDL_JoystickNumBalls(Joystick), SDL_JoystickNumHats(Joystick)); SDL_JoystickEventState(SDL_ENABLE);