From 30456b1515bce0da590ccc130b44c11bd46d0053 Mon Sep 17 00:00:00 2001
From: Dimitri <ddiakopoulos@gmail.com>
Date: Mon, 18 Apr 2016 08:25:44 -0700
Subject: [PATCH] libmodplug fixes for windows; added to vs2015 solution

---
 libnyquist.vcxproj/v140/libnyquist.vcxproj         | 2 ++
 libnyquist.vcxproj/v140/libnyquist.vcxproj.filters | 6 ++++++
 src/ModplugDependencies.cpp                        | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj b/libnyquist.vcxproj/v140/libnyquist.vcxproj
index 7fbb2e4..35df6b2 100644
--- a/libnyquist.vcxproj/v140/libnyquist.vcxproj
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj
@@ -33,6 +33,8 @@
     <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c" />
     <ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp" />
+    <ClCompile Include="..\..\src\ModplugDecoder.cpp" />
+    <ClCompile Include="..\..\src\ModplugDependencies.cpp" />
     <ClCompile Include="..\..\src\MusepackDecoder.cpp" />
     <ClCompile Include="..\..\src\MusepackDependencies.c" />
     <ClCompile Include="..\..\src\WavPackDependencies.c" />
diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
index 4c46476..b8c7378 100644
--- a/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
@@ -52,6 +52,12 @@
     <ClCompile Include="..\..\src\WavPackDependencies.c">
       <Filter>src\deps</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ModplugDependencies.cpp">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ModplugDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
diff --git a/src/ModplugDependencies.cpp b/src/ModplugDependencies.cpp
index 9a6c2bc..b876ddd 100644
--- a/src/ModplugDependencies.cpp
+++ b/src/ModplugDependencies.cpp
@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     #pragma clang diagnostic ignored "-Wconversion"
     #pragma clang diagnostic ignored "-Wshadow"
     #pragma clang diagnostic ignored "-Wdeprecated-register"
+    #define HAVE_SETENV
 #endif
 
 #ifndef MODPLUG_STATIC
@@ -40,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #define HAVE_SINF
-#define HAVE_SETENV
 
 #include "libmodplug/src/load_669.cpp"
 #include "libmodplug/src/load_abc.cpp"