From 52f300b3ac8586e67cc0cef27773ba199686c545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
Date: Sat, 13 Sep 2014 23:09:14 -0300
Subject: [PATCH] (Makefile.common) Add missing xinput autoconfig object

---
 Makefile.common      | 3 ++-
 input/input_common.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 66eba2ea93..e811f47ba9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -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
 
diff --git a/input/input_common.c b/input/input_common.c
index 897e7f403d..ded16967cf 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -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++)
    {