From f3d01e824487949c1a6c8eb8ebb73900d71c8e90 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 9 Sep 2019 21:54:07 +0200
Subject: [PATCH] - moved compression utilities to a 'thirdparty' folder to get
 them out of the way.

# Conflicts:
#	platform/Windows/build.vcxproj
#	platform/Windows/props/build_common.props
---
 platform/Windows/build.vcxproj                     | 14 ++++----------
 platform/Windows/props/build_common.props          |  2 +-
 source/{build => thirdparty}/include/lz4.h         |  0
 source/{build => thirdparty}/include/miniz.h       |  0
 .../{build => thirdparty}/include/miniz_common.h   |  0
 source/{build => thirdparty}/include/miniz_tdef.h  |  0
 source/{build => thirdparty}/include/miniz_tinfl.h |  0
 source/{build => thirdparty}/src/lz4.c             |  0
 source/{build => thirdparty}/src/miniz.c           |  0
 source/{build => thirdparty}/src/miniz_tdef.c      |  0
 source/{build => thirdparty}/src/miniz_tinfl.c     |  0
 11 files changed, 5 insertions(+), 11 deletions(-)
 rename source/{build => thirdparty}/include/lz4.h (100%)
 rename source/{build => thirdparty}/include/miniz.h (100%)
 rename source/{build => thirdparty}/include/miniz_common.h (100%)
 rename source/{build => thirdparty}/include/miniz_tdef.h (100%)
 rename source/{build => thirdparty}/include/miniz_tinfl.h (100%)
 rename source/{build => thirdparty}/src/lz4.c (100%)
 rename source/{build => thirdparty}/src/miniz.c (100%)
 rename source/{build => thirdparty}/src/miniz_tdef.c (100%)
 rename source/{build => thirdparty}/src/miniz_tinfl.c (100%)

diff --git a/platform/Windows/build.vcxproj b/platform/Windows/build.vcxproj
index 0699f7305..49c001f35 100644
--- a/platform/Windows/build.vcxproj
+++ b/platform/Windows/build.vcxproj
@@ -229,13 +229,7 @@
     <ClCompile Include="..\..\source\build\src\hightile.cpp" />
     <ClCompile Include="..\..\source\build\src\klzw.cpp" />
     <ClCompile Include="..\..\source\build\src\kplib.cpp" />
-    <ClCompile Include="..\..\source\build\src\lunatic.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\source\build\src\lz4.c" />
+    <ClCompile Include="..\..\source\thirdparty\src\lz4.c" />
     <ClCompile Include="..\..\source\build\src\md4.cpp" />
     <ClCompile Include="..\..\source\build\src\mdsprite.cpp" />
     <ClCompile Include="..\..\source\build\src\mhk.cpp" />
@@ -245,14 +239,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\source\build\src\miniz.c">
+    <ClCompile Include="..\..\source\thirdparty\src\miniz.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\source\build\src\miniz_tdef.c" />
-    <ClCompile Include="..\..\source\build\src\miniz_tinfl.c" />
+    <ClCompile Include="..\..\source\thirdparty\src\miniz_tdef.c" />
+    <ClCompile Include="..\..\source\thirdparty\src\miniz_tinfl.c" />
     <ClCompile Include="..\..\source\build\src\mmulti_null.cpp" />
     <ClCompile Include="..\..\source\build\src\mutex.cpp" />
     <ClCompile Include="..\..\source\build\src\osd.cpp" />
diff --git a/platform/Windows/props/build_common.props b/platform/Windows/props/build_common.props
index 29a2e9039..86386e96f 100644
--- a/platform/Windows/props/build_common.props
+++ b/platform/Windows/props/build_common.props
@@ -6,7 +6,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;RENDERTYPESDL=1;MIXERTYPEWIN=1;SDL_USEFOLDER;SDL_TARGET=2;USE_OPENGL=1;STARTUP_WINDOW;USE_LIBVPX;HAVE_VORBIS;HAVE_XMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./include;./include/vpx/;./include/sdl2/;../../source/build/include;../../source/mact/include;../../source/audiolib/include;../../source/enet/include;../../source/glad/include;../../source/libxmp-lite/include;../../source/libxmp-lite/include/libxmp-lite;../../source/libsmackerdec/include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./include;./include/vpx/;./include/sdl2/;../../source/build/include;../../source/mact/include;../../source/audiolib/include;../../source/enet/include;../../source/glad/include;../../source/libxmp-lite/include;../../source/libxmp-lite/include/libxmp-lite;../../source/libsmackerdec/include;../../source/thirdparty/include</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996;4244;4018;4267</DisableSpecificWarnings>
       <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
diff --git a/source/build/include/lz4.h b/source/thirdparty/include/lz4.h
similarity index 100%
rename from source/build/include/lz4.h
rename to source/thirdparty/include/lz4.h
diff --git a/source/build/include/miniz.h b/source/thirdparty/include/miniz.h
similarity index 100%
rename from source/build/include/miniz.h
rename to source/thirdparty/include/miniz.h
diff --git a/source/build/include/miniz_common.h b/source/thirdparty/include/miniz_common.h
similarity index 100%
rename from source/build/include/miniz_common.h
rename to source/thirdparty/include/miniz_common.h
diff --git a/source/build/include/miniz_tdef.h b/source/thirdparty/include/miniz_tdef.h
similarity index 100%
rename from source/build/include/miniz_tdef.h
rename to source/thirdparty/include/miniz_tdef.h
diff --git a/source/build/include/miniz_tinfl.h b/source/thirdparty/include/miniz_tinfl.h
similarity index 100%
rename from source/build/include/miniz_tinfl.h
rename to source/thirdparty/include/miniz_tinfl.h
diff --git a/source/build/src/lz4.c b/source/thirdparty/src/lz4.c
similarity index 100%
rename from source/build/src/lz4.c
rename to source/thirdparty/src/lz4.c
diff --git a/source/build/src/miniz.c b/source/thirdparty/src/miniz.c
similarity index 100%
rename from source/build/src/miniz.c
rename to source/thirdparty/src/miniz.c
diff --git a/source/build/src/miniz_tdef.c b/source/thirdparty/src/miniz_tdef.c
similarity index 100%
rename from source/build/src/miniz_tdef.c
rename to source/thirdparty/src/miniz_tdef.c
diff --git a/source/build/src/miniz_tinfl.c b/source/thirdparty/src/miniz_tinfl.c
similarity index 100%
rename from source/build/src/miniz_tinfl.c
rename to source/thirdparty/src/miniz_tinfl.c