(Griffin) Compile in overlay code - get rid of input_state

override for Android
This commit is contained in:
twinaphex 2012-12-20 20:48:09 +01:00
parent 60a4a20a79
commit 675124bda4
2 changed files with 5 additions and 4 deletions

View File

@ -77,6 +77,7 @@ default_paths_t default_paths;
#endif
/*============================================================
PERFORMANCE
============================================================ */
@ -228,6 +229,8 @@ FONTS
/*============================================================
INPUT
============================================================ */
#include "../../input/overlay.c"
#if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_input.c"
#elif defined(SN_TARGET_PSP2) || defined(PSP)

View File

@ -167,13 +167,11 @@ static inline bool input_key_pressed_func(int key)
#define input_poll_func() MAKENAME_INPUT(_input_poll)(driver.input_data)
#define input_input_state_func(retro_keybinds, port, device, index, id) \
MAKENAME_INPUT(_input_state)(driver.input_data, retro_keybinds, port, device, index, id)
#ifdef ANDROID
#define input_key_pressed_func(key) ((g_extern.lifecycle_state & (1ULL << key)) ? true : false)
#else
#define input_key_pressed_func(key) MAKENAME_INPUT(_input_key_pressed)(driver.input_data, key)
#endif
#define input_free_func() MAKENAME_INPUT(_input_free_input)(driver.input_data)
#define video_overlay_interface_func(iface) driver.video->overlay_interface(driver.video_data, iface)
#endif
#endif /* _RARCH_DRIVER_FUNCS_H */