From 80b6140a3e14a52f345dede32ee91d8185855c18 Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Wed, 16 Dec 2015 21:27:12 +0000
Subject: [PATCH] gsdx:windows: Prefer Windows SDK over old DX SDK

Some files are present in both the Windows SDK and the old DirectX SDK.
Use the newer versions of the files in the Windows SDK where possible.
---
 plugins/GSdx/vsprops/common.props | 1 +
 plugins/GSdx/vsprops/x64.props    | 6 ++++--
 plugins/GSdx/vsprops/x86.props    | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props
index fa802053ae..e0768144c3 100644
--- a/plugins/GSdx/vsprops/common.props
+++ b/plugins/GSdx/vsprops/common.props
@@ -4,6 +4,7 @@
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
     <OutDir>$(SolutionDir)bin\$(PcsxSubsection)\</OutDir>
     <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(DXSDK_DIR)Include;</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/plugins/GSdx/vsprops/x64.props b/plugins/GSdx/vsprops/x64.props
index 4703984444..563b3b1ed1 100644
--- a/plugins/GSdx/vsprops/x64.props
+++ b/plugins/GSdx/vsprops/x64.props
@@ -2,10 +2,12 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(DXSDK_DIR)Lib\x64;</LibraryPath>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x64;$(ProjectDir)vtune\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)vtune\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
       <PreprocessorDefinitions>_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/plugins/GSdx/vsprops/x86.props b/plugins/GSdx/vsprops/x86.props
index c37342f62e..81cba30ae7 100644
--- a/plugins/GSdx/vsprops/x86.props
+++ b/plugins/GSdx/vsprops/x86.props
@@ -2,10 +2,12 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(DXSDK_DIR)Lib\x86;</LibraryPath>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(ProjectDir)vtune\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)vtune\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile />
     <ClCompile>