From 93ae382995da003d6ee2435008d8f4796ee4e61b Mon Sep 17 00:00:00 2001
From: krcroft <krcroft@users.noreply.github.com>
Date: Mon, 11 Nov 2019 14:24:03 -0800
Subject: [PATCH] Remove conversion sources from the VisualStudio project

---
 src/platform/visualc/opusfile.h | 4 ++++
 visualc_net/dosbox.vcxproj      | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 src/platform/visualc/opusfile.h

diff --git a/src/platform/visualc/opusfile.h b/src/platform/visualc/opusfile.h
new file mode 100644
index 00000000..f4d5c87b
--- /dev/null
+++ b/src/platform/visualc/opusfile.h
@@ -0,0 +1,4 @@
+// This file exists only for MSVC builds.
+// It's needed because vcpkg does not set opusfile's subdirectory in its includes list
+// for projects that do not use cmake.
+#include <opus/opusfile.h>
diff --git a/visualc_net/dosbox.vcxproj b/visualc_net/dosbox.vcxproj
index af12d569..f9fb296d 100644
--- a/visualc_net/dosbox.vcxproj
+++ b/visualc_net/dosbox.vcxproj
@@ -69,7 +69,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>opengl32.lib;sdl_net.lib;winmm.lib;libpng16d.lib;sdlmaind.lib;sdl.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;opusfile.lib;opus.lib;ogg.lib;libspeexdsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;sdl_net.lib;winmm.lib;libpng16d.lib;sdlmaind.lib;sdl.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;opusfile.lib;opus.lib;ogg.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\Debug\dosbox.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -115,7 +115,7 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;libpng16.lib;sdl_net.lib;sdl.lib;sdlmain.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;opusfile.lib;opus.lib;ogg.lib;libspeexdsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;winmm.lib;libpng16.lib;sdl_net.lib;sdl.lib;sdlmain.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;opusfile.lib;opus.lib;ogg.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\Release/dosbox.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -246,7 +246,6 @@
     <ClCompile Include="..\src\ints\mouse.cpp" />
     <ClCompile Include="..\src\ints\xms.cpp" />
     <ClCompile Include="..\src\libs\gui_tk\gui_tk.cpp" />
-    <ClCompile Include="..\src\libs\decoders\audio_convert.c" />
     <ClCompile Include="..\src\libs\decoders\flac.c" />
     <ClCompile Include="..\src\libs\decoders\mp3.cpp" />
     <ClCompile Include="..\src\libs\decoders\mp3_seek_table.cpp" />