From a80a7175f35e1b70082dc27117bfe814f1c7b549 Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Mon, 29 Feb 2016 00:57:21 +0000
Subject: [PATCH] xpad: Use the Windows SDK and remove unneeded dependencies

---
 plugins/xpad/stdafx.h             | 1 -
 plugins/xpad/vsprops/common.props | 4 ----
 plugins/xpad/xpad.cpp             | 4 ++++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/xpad/stdafx.h b/plugins/xpad/stdafx.h
index 79ef23aede..ca7195e206 100644
--- a/plugins/xpad/stdafx.h
+++ b/plugins/xpad/stdafx.h
@@ -12,7 +12,6 @@
 #include <commctrl.h>
 #include <commdlg.h>
 #include <shellapi.h>
-#include <xinput.h>
 
 #include <assert.h>
 #include <time.h>
diff --git a/plugins/xpad/vsprops/common.props b/plugins/xpad/vsprops/common.props
index 2698a1f853..613c944fc5 100644
--- a/plugins/xpad/vsprops/common.props
+++ b/plugins/xpad/vsprops/common.props
@@ -12,16 +12,12 @@
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4995;4324;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>d3d10.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\bin\plugins\$(ProjectName).dll</OutputFile>
-      <DelayLoadDLLs>d3d9.dll;d3dx9_43.dll;d3d10.dll;d3dx10_43.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/plugins/xpad/xpad.cpp b/plugins/xpad/xpad.cpp
index eb390bf8af..4da8b77816 100644
--- a/plugins/xpad/xpad.cpp
+++ b/plugins/xpad/xpad.cpp
@@ -23,6 +23,10 @@
 #include "xpad.h"
 #include <VersionHelpers.h>
 
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0602 // Required for XInputEnable definition
+#include <xinput.h>
+
 static HMODULE s_hModule;
 static HMODULE s_xInputDll;
 static decltype(&XInputEnable) pXInputEnable;