mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HAVE_XINPUT ifdef

Browse Source
This commit is contained in:
twinaphex 2016-12-07 07:08:27 +01:00
parent bcfb80072c
commit 7327e98c8a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
input/drivers_joypad/dinput_joypad.c
View File

@ -107,7 +107,7 @@ static BOOL CALLBACK enum_axes_cb(const DIDEVICEOBJECTINSTANCE *inst, void *p)
return DIENUM_CONTINUE; return DIENUM_CONTINUE;
} }
#ifdef HAVE_XINPUT
/* Based on SDL2's implementation. */ /* Based on SDL2's implementation. */
static bool guid_is_xinput_device(const GUID* product_guid) static bool guid_is_xinput_device(const GUID* product_guid)
{ {
@ -173,6 +173,7 @@ static bool guid_is_xinput_device(const GUID* product_guid)
raw_devs = NULL; raw_devs = NULL;
return false; return false;
} }
#endif
static const char *dinput_joypad_name(unsigned pad) static const char *dinput_joypad_name(unsigned pad)
{ {
@ -269,10 +270,17 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
dinput_joypad_name(g_joypad_cnt), dinput_joypad_name(g_joypad_cnt),
sizeof(settings->input.device_names[g_joypad_cnt])); sizeof(settings->input.device_names[g_joypad_cnt]));
strlcpy(params.name,
dinput_joypad_name(g_joypad_cnt),
sizeof(params.name));
strlcpy(params.display_name,
dinput_joypad_friendly_name(g_joypad_cnt),
sizeof(params.driver));
strlcpy(params.driver,
dinput_joypad.ident,
sizeof(params.driver));
params.idx = g_joypad_cnt; params.idx = g_joypad_cnt;
strlcpy(params.name, dinput_joypad_name(g_joypad_cnt), sizeof(params.name));
strlcpy(params.display_name, dinput_joypad_friendly_name(g_joypad_cnt), sizeof(params.driver));
strlcpy(params.driver, dinput_joypad.ident, sizeof(params.driver));
params.vid = dinput_joypad_vid(g_joypad_cnt); params.vid = dinput_joypad_vid(g_joypad_cnt);
params.pid = dinput_joypad_pid(g_joypad_cnt); params.pid = dinput_joypad_pid(g_joypad_cnt);