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

(XDK) Build fix

This commit is contained in:
twinaphex 2012-12-02 06:01:39 +01:00
parent 3f50384a3b
commit 321596fc73
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver_funcs.h
View File

@ -147,7 +147,7 @@ static inline bool input_key_pressed_func(int key)
============================================================ */ ============================================================ */
#if defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9)) /* D3D */ #if defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9)) /* D3D */
#define MAKENAME_INPUT(A) CONCAT2(xdk, A)
#elif defined(GEKKO) /* Gamecube, Wii */ #elif defined(GEKKO) /* Gamecube, Wii */
#define MAKENAME_INPUT(A) CONCAT2(gx, A) #define MAKENAME_INPUT(A) CONCAT2(gx, A)
#define gfx_ctx_window_has_focus() (true) #define gfx_ctx_window_has_focus() (true)

34
xdk/xdk_xinput_input.c
View File

@ -83,7 +83,7 @@ const struct platform_bind platform_keys[] = {
const unsigned int platform_keys_size = sizeof(platform_keys); const unsigned int platform_keys_size = sizeof(platform_keys);
static void xinput_input_poll(void *data) static void xdk_input_poll(void *data)
{ {
(void)data; (void)data;
@ -201,7 +201,7 @@ static void xinput_input_poll(void *data)
#endif #endif
} }
static int16_t xinput_input_state(void *data, const struct retro_keybind **binds, static int16_t xdk_input_state(void *data, const struct retro_keybind **binds,
unsigned port, unsigned device, unsigned port, unsigned device,
unsigned index, unsigned id) unsigned index, unsigned id)
{ {
@ -212,12 +212,12 @@ static int16_t xinput_input_state(void *data, const struct retro_keybind **binds
return (state[player] & button) ? 1 : 0; return (state[player] & button) ? 1 : 0;
} }
static void xinput_input_free_input(void *data) static void xdk_input_free_input(void *data)
{ {
(void)data; (void)data;
} }
static void xinput_set_default_keybind_lut(unsigned device, unsigned port) static void xdk_set_default_keybind_lut(unsigned device, unsigned port)
{ {
(void)device; (void)device;
(void)port; (void)port;
@ -247,7 +247,7 @@ static void xinput_set_default_keybind_lut(unsigned device, unsigned port)
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = platform_keys[XDK_DEVICE_ID_RSTICK_THUMB].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = platform_keys[XDK_DEVICE_ID_RSTICK_THUMB].joykey;
} }
static void xinput_input_set_analog_dpad_mapping(unsigned device, unsigned map_dpad_enum, unsigned controller_id) static void xdk_input_set_analog_dpad_mapping(unsigned device, unsigned map_dpad_enum, unsigned controller_id)
{ {
(void)device; (void)device;
@ -277,7 +277,7 @@ static void xinput_input_set_analog_dpad_mapping(unsigned device, unsigned map_d
} }
} }
static void* xinput_input_init(void) static void *xdk_input_init(void)
{ {
#ifdef _XBOX1 #ifdef _XBOX1
XInitDevices(0, NULL); XInitDevices(0, NULL);
@ -303,13 +303,13 @@ static void* xinput_input_init(void)
#define STUB_DEVICE 0 #define STUB_DEVICE 0
static void xinput_input_post_init(void) static void xdk_input_post_init(void)
{ {
for(unsigned i = 0; i < MAX_PADS; i++) for(unsigned i = 0; i < MAX_PADS; i++)
xinput_input_set_analog_dpad_mapping(STUB_DEVICE, g_settings.input.dpad_emulation[i], i); xdk_input_set_analog_dpad_mapping(STUB_DEVICE, g_settings.input.dpad_emulation[i], i);
} }
static bool xinput_input_key_pressed(void *data, int key) static bool xdk_input_key_pressed(void *data, int key)
{ {
(void)data; (void)data;
bool retval = false; bool retval = false;
@ -361,14 +361,14 @@ static bool xinput_input_key_pressed(void *data, int key)
const input_driver_t input_xinput = const input_driver_t input_xinput =
{ {
xinput_input_init, xdk_input_init,
xinput_input_poll, xdk_input_poll,
xinput_input_state, xdk_input_state,
xinput_input_key_pressed, xdk_input_key_pressed,
xinput_input_free_input, xdk_input_free_input,
xinput_set_default_keybind_lut, xdk_set_default_keybind_lut,
xinput_input_set_analog_dpad_mapping, xdk_input_set_analog_dpad_mapping,
xinput_input_post_init, xdk_input_post_init,
MAX_PADS, MAX_PADS,
"xinput" "xinput"
}; };