mirror of
https://github.com/libretro/RetroArch.git
synced 2025-02-21 18:21:51 +00:00
Change HAVE_WINXINPUT to HAVE_XINPUT
This commit is contained in:
parent
ed9ad7c9d7
commit
592e5d9f4a
@ -374,8 +374,8 @@ ifeq ($(HAVE_DINPUT), 1)
|
||||
JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_WINXINPUT), 1)
|
||||
DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG
|
||||
ifeq ($(HAVE_XINPUT), 1)
|
||||
DEFINES += -DHAVE_XINPUT -DHAVE_BUILTIN_AUTOCONFIG
|
||||
OBJ += input/drivers_joypad/xinput_joypad.o \
|
||||
input/autoconf/builtin_win.o
|
||||
endif
|
||||
|
@ -20,7 +20,7 @@ HAVE_ZLIB_DEFLATE = 1
|
||||
HAVE_PYTHON = 0
|
||||
DYNAMIC = 1
|
||||
|
||||
HAVE_WINXINPUT = 1
|
||||
HAVE_XINPUT = 1
|
||||
|
||||
HAVE_SDL := 0
|
||||
HAVE_SDL2 := 0
|
||||
|
@ -838,7 +838,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
|
||||
|
||||
g_pads[g_joypad_cnt].joy_name = strdup(inst->tszProductName);
|
||||
|
||||
#ifdef HAVE_WINXINPUT
|
||||
#ifdef HAVE_XINPUT
|
||||
#if 0
|
||||
is_xinput_pad = g_xinput_block_pads
|
||||
&& name_is_xinput_pad(inst->tszProductName);
|
||||
@ -861,7 +861,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
|
||||
IDirectInputDevice8_EnumObjects(*pad, enum_axes_cb,
|
||||
*pad, DIDFT_ABSAXIS);
|
||||
|
||||
#ifdef HAVE_WINXINPUT
|
||||
#ifdef HAVE_XINPUT
|
||||
if (!is_xinput_pad)
|
||||
#endif
|
||||
{
|
||||
|
@ -26,7 +26,7 @@ static rarch_joypad_driver_t *joypad_drivers[] = {
|
||||
#ifdef __CELLOS_LV2__
|
||||
&ps3_joypad,
|
||||
#endif
|
||||
#ifdef HAVE_WINXINPUT
|
||||
#ifdef HAVE_XINPUT
|
||||
&xinput_joypad,
|
||||
#endif
|
||||
#ifdef GEKKO
|
||||
|
@ -219,7 +219,7 @@ if [ "$OS" = 'Win32' ]; then
|
||||
check_lib DSOUND -ldsound
|
||||
|
||||
if [ "$HAVE_DINPUT" != 'no' ]; then
|
||||
HAVE_WINXINPUT=yes
|
||||
HAVE_XINPUT=yes
|
||||
fi
|
||||
|
||||
HAVE_XAUDIO=yes
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include "../input/drivers/dinput.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_WINXINPUT)
|
||||
#if defined(HAVE_XINPUT)
|
||||
#include "../input/drivers_joypad/xinput_joypad.c"
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user