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

(Apple) Buildfix

This commit is contained in:
twinaphex 2015-11-29 15:46:01 +01:00
parent bc748951c6
commit 99cc4c59c3
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/drivers/apple_keycode.h
View File

@ -160,6 +160,8 @@ enum
KEY_RightGUI = 231 KEY_RightGUI = 231
}; };
#include <stdint.h>
#include "../input_config.h" #include "../input_config.h"
int16_t apple_input_is_pressed(unsigned port_num, int16_t apple_input_is_pressed(unsigned port_num,
@ -167,7 +169,7 @@ int16_t apple_input_is_pressed(unsigned port_num,
int16_t apple_keyboard_state(unsigned id); int16_t apple_keyboard_state(unsigned id);
void apple_keyboard_find_any_key(void); int32_t apple_keyboard_find_any_key(void);
void apple_keyboard_free(void); void apple_keyboard_free(void);

4
input/drivers/cocoa_input.c
View File

@ -38,9 +38,7 @@ int32_t cocoa_input_find_any_key(void)
if (apple->sec_joypad) if (apple->sec_joypad)
apple->sec_joypad->poll(); apple->sec_joypad->poll();
apple_keyboard_find_any_key(); return apple_keyboard_find_any_key();
return 0;
} }
static int cocoa_input_find_any_button_ret(cocoa_input_data_t *apple, static int cocoa_input_find_any_button_ret(cocoa_input_data_t *apple,

4
input/drivers_keyboard/keyboard_event_apple.c
View File

@ -326,13 +326,15 @@ int16_t apple_keyboard_state(unsigned id)
return (id < RETROK_LAST) && apple_key_state[bit]; return (id < RETROK_LAST) && apple_key_state[bit];
} }
void apple_keyboard_find_any_key(void) int32_t apple_keyboard_find_any_key(void)
{ {
unsigned i; unsigned i;
for (i = 0; apple_key_name_map[i].hid_id; i++) for (i = 0; apple_key_name_map[i].hid_id; i++)
if (apple_key_state[apple_key_name_map[i].hid_id]) if (apple_key_state[apple_key_name_map[i].hid_id])
return apple_key_name_map[i].hid_id; return apple_key_name_map[i].hid_id;
return 0;
} }
void apple_keyboard_free(void) void apple_keyboard_free(void)