Drop support for the DirectX SDK and require the Windows 8 SDK for DirectSound

This commit is contained in:
Thomas Goyne 2014-06-29 10:33:08 -07:00
parent e53b2dab6b
commit a38793497f
4 changed files with 1 additions and 28 deletions

View file

@ -105,29 +105,14 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- DirectSound support --> <!-- DirectSound support -->
<PropertyGroup>
<DirectXSDKDir Condition="'$(DirectXSDKDir)'==''">$(DXSDK_DIR)</DirectXSDKDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(AegisubUseDSound)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseDSound)'=='true'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>WITH_DIRECTSOUND;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WITH_DIRECTSOUND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(DXSDK_DIR)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <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> <AdditionalDependencies>dsound.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </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 --> <!-- Special builds -->
<ItemDefinitionGroup> <ItemDefinitionGroup>

View file

@ -108,7 +108,7 @@
Name="AegisubUseDSound" Name="AegisubUseDSound"
Category="Features" Category="Features"
DisplayName="DirectSound" DisplayName="DirectSound"
Description="Enable the DirectSound-based audio player. This requires the DirectX SDK." Description="Enable the DirectSound-based audio player"
/> />
<BoolProperty <BoolProperty
@ -164,14 +164,6 @@
Description="Name of external CSRI library, for when not using the CSRI helper library" 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 <StringProperty
Subtype="folder" Subtype="folder"
Name="FfmsSrcDir" Name="FfmsSrcDir"

View file

@ -45,7 +45,6 @@
<AegisubUseOpenAl>false</AegisubUseOpenAl> <AegisubUseOpenAl>false</AegisubUseOpenAl>
<AegisubUseUpdateChecker>true</AegisubUseUpdateChecker> <AegisubUseUpdateChecker>true</AegisubUseUpdateChecker>
<CsriLibraryName>vsfilter.lib</CsriLibraryName> <CsriLibraryName>vsfilter.lib</CsriLibraryName>
<DirectXSDKPath>$(DXSDK_DIR)</DirectXSDKPath>
<StartupLog>false</StartupLog> <StartupLog>false</StartupLog>
<UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer> <UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer>
<UpdateCheckerURL>/trunk</UpdateCheckerURL> <UpdateCheckerURL>/trunk</UpdateCheckerURL>

View file

@ -48,9 +48,6 @@
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
// Ensure we get a consistent SDK with VS2012 + Win8 SDK
#define _USING_V110_SDK71_ 1
#ifndef _WIN32 #ifndef _WIN32
#include "../acconf.h" #include "../acconf.h"
#endif #endif