From a38793497fd60a78688b2597d76131c029fa68cf Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 29 Jun 2014 10:33:08 -0700
Subject: [PATCH] Drop support for the DirectX SDK and require the Windows 8
 SDK for DirectSound

---
 build/Aegisub/Aegisub.targets    | 15 ---------------
 build/Aegisub/Aegisub.xml        | 10 +---------
 build/DefaultConfiguration.props |  1 -
 src/agi_pre.h                    |  3 ---
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/build/Aegisub/Aegisub.targets b/build/Aegisub/Aegisub.targets
index 438a7790b..16ddc987a 100644
--- a/build/Aegisub/Aegisub.targets
+++ b/build/Aegisub/Aegisub.targets
@@ -105,29 +105,14 @@
   </ItemDefinitionGroup>
 
   <!-- DirectSound support -->
-  <PropertyGroup>
-    <DirectXSDKDir Condition="'$(DirectXSDKDir)'==''">$(DXSDK_DIR)</DirectXSDKDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(AegisubUseDSound)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions>WITH_DIRECTSOUND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DXSDK_DIR)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(DirectXSDKDir)\Lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(DirectXSDKDir)\Lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>dsound.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <Target Name="AegisubCheckDirectXSDK" BeforeTargets="PrepareForBuild" >
-    <Error
-      Condition="'$(DirectXSDKDir)'=='' or !Exists('$(DirectXSDKDir)\Include\dsound.h')"
-      Text="DirectX SDK not found, check that the DXSDK_DIR environment is set. If you do not want to use DirectSound set the AegisubUseDSound property to false in a user config."
-      />
-  </Target>
-  <ItemGroup Condition="'$(AegisubUseDSound)'=='true'">
-    <AegisubCheckDirectXSDK Include="dsound" />
-  </ItemGroup>
 
   <!-- Special builds -->
   <ItemDefinitionGroup>
diff --git a/build/Aegisub/Aegisub.xml b/build/Aegisub/Aegisub.xml
index 667b31afa..9012b3dfb 100644
--- a/build/Aegisub/Aegisub.xml
+++ b/build/Aegisub/Aegisub.xml
@@ -108,7 +108,7 @@
     Name="AegisubUseDSound"
     Category="Features"
     DisplayName="DirectSound"
-    Description="Enable the DirectSound-based audio player. This requires the DirectX SDK."
+    Description="Enable the DirectSound-based audio player"
     />
 
   <BoolProperty
@@ -164,14 +164,6 @@
     Description="Name of external CSRI library, for when not using the CSRI helper library"
     />
 
-  <StringProperty
-    Subtype="folder"
-    Name="DirectXSDKPath"
-    Category="Paths"
-    DisplayName="DirectX SDK root path"
-    Description="Location of DirectX SDK installation for DirectSound support. This is usually auto-detected."
-    />
-
   <StringProperty
     Subtype="folder"
     Name="FfmsSrcDir"
diff --git a/build/DefaultConfiguration.props b/build/DefaultConfiguration.props
index 087a4d3cd..1f3c0a653 100644
--- a/build/DefaultConfiguration.props
+++ b/build/DefaultConfiguration.props
@@ -45,7 +45,6 @@
     <AegisubUseOpenAl>false</AegisubUseOpenAl>
     <AegisubUseUpdateChecker>true</AegisubUseUpdateChecker>
     <CsriLibraryName>vsfilter.lib</CsriLibraryName>
-    <DirectXSDKPath>$(DXSDK_DIR)</DirectXSDKPath>
     <StartupLog>false</StartupLog>
     <UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer>
     <UpdateCheckerURL>/trunk</UpdateCheckerURL>
diff --git a/src/agi_pre.h b/src/agi_pre.h
index e16ed1f8f..63e045dca 100644
--- a/src/agi_pre.h
+++ b/src/agi_pre.h
@@ -48,9 +48,6 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-// Ensure we get a consistent SDK with VS2012 + Win8 SDK
-#define _USING_V110_SDK71_ 1
-
 #ifndef _WIN32
 #include "../acconf.h"
 #endif