Removed all platform-specific code; the entire project is now solely …

…dependent on FerrisLibs :)
yupferris · May 18, 2013 · 5427888 · 5427888
1 parent b3af887
commit 5427888
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 240 deletions.
diff --git a/DirectSoundAudioDriver.cpp b/DirectSoundAudioDriver.cpp
diff --git a/DirectSoundAudioDriver.h b/DirectSoundAudioDriver.h
diff --git a/Main.cpp b/Main.cpp
@@ -1,7 +1,6 @@
 #include "Common.h"
 #include "Chip8/Chip8.h"
 #include "Config.h"
-#include "DirectSoundAudioDriver.h"
 
 int Main(const List<String>& arguments)
 {
@@ -12,7 +11,7 @@ int Main(const List<String>& arguments)
 		auto videoDriver = VideoDriverFactory::CreateDefault();
 		chip8.SetVideoDriver(videoDriver);
 
-		auto audioDriver = new DirectSoundAudioDriver();
+		auto audioDriver = AudioDriverFactory::CreateDefault();
 		chip8.SetAudioDriver(audioDriver);
 
 		const int numLatencies = 8;

diff --git a/Vip8.vcxproj b/Vip8.vcxproj
@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>FslD.lib;FmlD.lib;FelD.lib;FglD.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>FslD.lib;FmlD.lib;FelD.lib;FglD.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -74,15 +74,14 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Fsl.lib;Fml.lib;Fel.lib;Fgl.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Fsl.lib;Fml.lib;Fel.lib;Fgl.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Chip8\Apu.cpp" />
     <ClCompile Include="Chip8\Chip8.cpp" />
     <ClCompile Include="Chip8\Gpu.cpp" />
     <ClCompile Include="Config.cpp" />
-    <ClCompile Include="DirectSoundAudioDriver.cpp" />
     <ClCompile Include="Main.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -91,7 +90,6 @@
     <ClInclude Include="Chip8\Gpu.h" />
     <ClInclude Include="Common.h" />
     <ClInclude Include="Config.h" />
-    <ClInclude Include="DirectSoundAudioDriver.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/Vip8.vcxproj.filters b/Vip8.vcxproj.filters
@@ -13,7 +13,6 @@
     <ClCompile Include="Chip8\Gpu.cpp">
       <Filter>Chip8</Filter>
     </ClCompile>
-    <ClCompile Include="DirectSoundAudioDriver.cpp" />
     <ClCompile Include="Chip8\Apu.cpp">
       <Filter>Chip8</Filter>
     </ClCompile>
@@ -27,7 +26,6 @@
     <ClInclude Include="Chip8\Gpu.h">
       <Filter>Chip8</Filter>
     </ClInclude>
-    <ClInclude Include="DirectSoundAudioDriver.h" />
     <ClInclude Include="Chip8\Apu.h">
       <Filter>Chip8</Filter>
     </ClInclude>