(Makefile.common) Add missing xinput autoconfig object

This commit is contained in:
Higor Eurípedes 2014-09-13 23:09:14 -03:00
parent fd9b58fea6
commit 52f300b3ac
2 changed files with 3 additions and 2 deletions

View File

@ -281,7 +281,8 @@ endif
ifeq ($(HAVE_WINXINPUT), 1)
DEFINES += -DHAVE_WINXINPUT
OBJ += input/winxinput_joypad.o
OBJ += input/winxinput_joypad.o \
input/autoconf/builtin_win.o
JOYCONFIG_OBJ += input/winxinput_joypad.o
endif

View File

@ -1450,7 +1450,7 @@ void input_config_autoconfigure_joypad(unsigned index,
/* false = load from both cfg files and internal */
bool internal_only = !*g_settings.input.autoconfig_dir;
#ifdef HAVE_BUILTIN_AUTOCONFIG
#if defined(HAVE_BUILTIN_AUTOCONFIG) && (!defined(_WIN32) || defined(HAVE_WINXINPUT))
/* First internal */
for (i = 0; input_builtin_autoconfs[i]; i++)
{