miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: fixed compilation with GCC toolchain

Browse Source
This commit is contained in:
Sergii Pylypenko
2017-11-08 22:47:53 +02:00
parent b12fc6e402
commit 169a2bf551
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
View File

@@ -1764,7 +1764,8 @@ void SDL_ANDROID_SetIndividualGamepadKeymap(int GamepadId,
void SDL_ANDROID_SetGamepadKeymap(int A, int B, int X, int Y, int L1, int R1, int L2, int R2, int LThumb, int RThumb) void SDL_ANDROID_SetGamepadKeymap(int A, int B, int X, int Y, int L1, int R1, int L2, int R2, int LThumb, int RThumb)
{ {
for( int i = 0; i < SDL_ANDROID_MAX_GAMEPADS; i++ ) int i;
for( i = 0; i < SDL_ANDROID_MAX_GAMEPADS; i++ )
{ {
SDL_ANDROID_SetIndividualGamepadKeymap(i, A, B, X, Y, L1, R1, L2, R2, LThumb, RThumb, 0, 0, 0, 0, 0, 0); SDL_ANDROID_SetIndividualGamepadKeymap(i, A, B, X, Y, L1, R1, L2, R2, LThumb, RThumb, 0, 0, 0, 0, 0, 0);
} }

6
project/jni/sdl-1.2/src/video/android/keymap.c
View File

@@ -259,9 +259,11 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
keymap[KEYCODE_MOUSE_X1] = SDL_KEY(MOUSE_X1); keymap[KEYCODE_MOUSE_X1] = SDL_KEY(MOUSE_X1);
keymap[KEYCODE_MOUSE_X2] = SDL_KEY(MOUSE_X2); keymap[KEYCODE_MOUSE_X2] = SDL_KEY(MOUSE_X2);
for( int gamepadId = 0; gamepadId < SDL_ANDROID_MAX_GAMEPADS; gamepadId++ ) int gamepadId;
for( gamepadId = 0; gamepadId < SDL_ANDROID_MAX_GAMEPADS; gamepadId++ )
{ {
for( int i = 0; i < KEYCODE_LAST+1; i++ ) int i;
for( i = 0; i < KEYCODE_LAST+1; i++ )
{ {
SDL_android_gamepad_keymap[gamepadId][i] = SDL_android_keymap[i]; SDL_android_gamepad_keymap[gamepadId][i] = SDL_android_keymap[i];
} }