Browse Source

Compression support

Brian Fiete 3 years ago
parent
commit
fbb622e956

+ 2 - 0
BeefySysLib/BeefySysLib.vcxproj

@@ -1930,6 +1930,7 @@ copy /y "$(OutDir)$(TargetName).lib" "$(SolutionDir)\BeefLibs\Beefy2D\dist\"</Co
     <ClCompile Include="util\BSpline.cpp" />
     <ClCompile Include="util\CatmullRom.cpp" />
     <ClCompile Include="util\ChunkedDataBuffer.cpp" />
+    <ClCompile Include="util\Compress.cpp" />
     <ClCompile Include="util\CubicFuncSpline.cpp" />
     <ClCompile Include="util\CubicSpline.cpp" />
     <ClCompile Include="util\Hash.cpp" />
@@ -2157,6 +2158,7 @@ copy /y "$(OutDir)$(TargetName).lib" "$(SolutionDir)\BeefLibs\Beefy2D\dist\"</Co
     <ClInclude Include="util\CatmullRom.h" />
     <ClInclude Include="Util\ChunkedDataBuffer.h" />
     <ClInclude Include="util\ChunkedVector.h" />
+    <ClInclude Include="util\Compress.h" />
     <ClInclude Include="util\CritSect.h" />
     <ClInclude Include="util\CubicFuncSpline.h" />
     <ClInclude Include="util\CubicSpline.h" />

+ 6 - 0
BeefySysLib/BeefySysLib.vcxproj.filters

@@ -719,6 +719,9 @@
     <ClCompile Include="util\Sphere.cpp">
       <Filter>src\util</Filter>
     </ClCompile>
+    <ClCompile Include="util\Compress.cpp">
+      <Filter>src\util</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Common.h">
@@ -1099,6 +1102,9 @@
     <ClInclude Include="util\Sphere.h">
       <Filter>src\util</Filter>
     </ClInclude>
+    <ClInclude Include="util\Compress.h">
+      <Filter>src\util</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="third_party\libffi\i686-pc-cygwin\src\x86\win32.asm">

+ 1 - 0
BeefySysLib/CMakeLists.txt

@@ -278,6 +278,7 @@ file(GLOB SRC_FILES
     util/BSpline.cpp
     util/CatmullRom.cpp
     util/ChunkedDataBuffer.cpp
+    util/Compress.cpp
     util/CubicFuncSpline.cpp
     util/CubicSpline.cpp
     util/FileEnumerator.cpp

+ 2 - 2
BeefySysLib/util/Heap.cpp

@@ -421,7 +421,7 @@ void ContiguousHeap::DebugDump()
 				str += "Merged";
 				break;
 			default:
-				str += "??????";				
+				str += "??????";
 			}
 
 			str += "\n";
@@ -440,7 +440,7 @@ void ContiguousHeap::DebugDump()
 	for (auto idx : mFreeList)
 	{
 		auto block = CH_REL_TO_ABS(idx);
-		char* kind = "??";
+		const char* kind = "??";
 		if (block->mKind == ChBlockKind_Unused)
 			kind = "Unused";
 		else