summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2021-01-14 22:06:27 +0100
committerFilip Gawin <filip.gawin@zoho.com>2021-01-14 22:06:27 +0100
commitc7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1 (patch)
tree40f48630eae122d458502b43a7c8d24502940697 /src/core
parentBackport fix from re3 (diff)
downloadre3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar
re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.gz
re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.bz2
re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.lz
re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.xz
re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.zst
re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Pad.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index feda19c6..8d55250a 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -10,6 +10,7 @@
#include "crossplatform.h"
#include "platform.h"
#ifdef XINPUT
+#if defined _MSC_VER && !defined RE3_NO_AUTOLINK
#include <xinput.h>
#if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1)
#pragma comment( lib, "Xinput9_1_0.lib" )
@@ -17,6 +18,7 @@
#pragma comment( lib, "Xinput.lib" )
#endif
#endif
+#endif
#include "Pad.h"
#include "ControllerConfig.h"