ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: Fix SDL 1.2 build

This commit is contained in:
Jeffrey Pfau 2016-05-11 23:09:22 -07:00
parent f2829eef01
commit 9c6b81841e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -18,6 +18,7 @@ Bugfixes:
- GBA Memory: Fix executing code from OBJ region of VRAM - GBA Memory: Fix executing code from OBJ region of VRAM
- Util: Fix socket bind addresses - Util: Fix socket bind addresses
- All: Fix instruction tables getting zeroed when linking sometimes - All: Fix instruction tables getting zeroed when linking sometimes
- SDL: Fix SDL 1.2 build
Misc: Misc:
- GBA: Slightly optimize GBAProcessEvents - GBA: Slightly optimize GBAProcessEvents
- Qt: Add preset for DualShock 4 - Qt: Add preset for DualShock 4

4
src/platform/sdl/sdl-events.c
View File

@ -63,10 +63,12 @@ bool GBASDLInitEvents(struct GBASDLEvents* context) {
for (i = 0; i < nJoysticks; ++i) { for (i = 0; i < nJoysticks; ++i) {
struct SDL_JoystickCombo* joystick = SDL_JoystickListAppend(&context->joysticks); struct SDL_JoystickCombo* joystick = SDL_JoystickListAppend(&context->joysticks);
joystick->joystick = SDL_JoystickOpen(i); joystick->joystick = SDL_JoystickOpen(i);
joystick->id = SDL_JoystickInstanceID(joystick->joystick);
joystick->index = SDL_JoystickListSize(&context->joysticks) - 1; joystick->index = SDL_JoystickListSize(&context->joysticks) - 1;
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
joystick->id = SDL_JoystickInstanceID(joystick->joystick);
joystick->haptic = SDL_HapticOpenFromJoystick(joystick->joystick); joystick->haptic = SDL_HapticOpenFromJoystick(joystick->joystick);
#else
joystick->id = SDL_JoystickIndex(joystick->joystick);
#endif #endif
} }
} }