Merge pull request #858 from shuffle2/dx-old

Add headers required by XAudio2_7 to externals.

3 files changed, 7 insertions, 44 deletions

diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj
index d9030c1ca6..4bf2996e44 100644
--- a/Source/Core/AudioCommon/AudioCommon.vcxproj
+++ b/Source/Core/AudioCommon/AudioCommon.vcxproj
@@ -45,7 +45,7 @@
     <ClCompile Include="WaveFile.cpp" />
     <ClCompile Include="XAudio2Stream.cpp" />
     <ClCompile Include="XAudio2_7Stream.cpp">
-      <AdditionalIncludeDirectories Condition="Exists('$(DXSDK_DIR)')">$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)XAudio2_7;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp
index 8739e919f5..cce45d7942 100644
--- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp
+++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp
@@ -2,28 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-// Note that this file *and this file only* must also have %DXSDK_DIR%/Include prepended
-// to its include path in order fetch dxsdkver.h and XAudio2.h from the DXSDK
-// instead of other possible places. This may be accomplished by adding the path to
-// the AdditionalIncludeDirectories for this file via msbuild.
+// Note that this file *and this file only* must include XAudio2.h from the old
+// DXSDK instead of other possible places.
+
+#include <XAudio2_7/XAudio2.h>
 
 #include "AudioCommon/AudioCommon.h"
 #include "AudioCommon/XAudio2_7Stream.h"
 #include "Common/Event.h"
 
-#ifdef HAVE_DXSDK
-#include <dxsdkver.h>
-#if (_DXSDK_PRODUCT_MAJOR == 9) && (_DXSDK_PRODUCT_MINOR == 29) && (_DXSDK_BUILD_MAJOR == 1962) && (_DXSDK_BUILD_MINOR == 0)
-#define HAVE_DXSDK_JUNE_2010
-#else
-#pragma message("You have DirectX SDK installed, but it is not the expected version (June 2010). Update it to build this module.")
-#endif
-#endif
-
-#ifdef HAVE_DXSDK_JUNE_2010
-
-#include <XAudio2.h>
-
 struct StreamingVoiceContext2_7 : public IXAudio2VoiceCallback
 {
 private:
@@ -260,28 +247,3 @@ void XAudio2_7::Stop()
 		m_xaudio2_dll = nullptr;
 	}
 }
-
-#else
-
-struct StreamingVoiceContext2_7 {};
-struct IXAudio2 {};
-struct IXAudio2MasteringVoice {};
-void XAudio2_7::ReleaseIXAudio2(IXAudio2* ptr) {}
-
-XAudio2_7::XAudio2_7(CMixer *mixer)
-	: SoundStream(mixer)
-	, m_mastering_voice(nullptr)
-	, m_volume(1.0f)
-	, m_cleanup_com(false)
-{}
-
-XAudio2_7::~XAudio2_7() {}
-
-bool XAudio2_7::Start() { return SoundStream::Start(); }
-void XAudio2_7::Stop() {}
-void XAudio2_7::Update() {}
-void XAudio2_7::Clear(bool mute) {}
-void XAudio2_7::SetVolume(int volume) {}
-bool XAudio2_7::InitLibrary() { return false; }
-
-#endif
diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h
index 99c0ca690f..f2bc247d21 100644
--- a/Source/Core/AudioCommon/XAudio2_7Stream.h
+++ b/Source/Core/AudioCommon/XAudio2_7Stream.h
@@ -5,10 +5,11 @@
 // This audio backend uses XAudio2 via XAudio2_7.dll
 // This version of the library is included in the June 2010 DirectX SDK and
 // works on all versions of Windows, however the SDK and/or redist must be
-// seperately installed.
+// separately installed.
 // Therefore this backend is available iff:
 //  * SDK is available at compile-time
 //  * runtime dll is available at runtime
+// Dolphin ships the relevant SDK headers in Externals, so it's always available.
 
 #pragma once