Update miniz to 3.0.2

drhelius · Aug 26, 2024 · 5b9509f · 5b9509f
1 parent 1280c6a
commit 5b9509f
Show file tree

Hide file tree

Showing 6 changed files with 331 additions and 150 deletions.
diff --git a/platforms/shared/desktop/makefiles/Makefile.sources b/platforms/shared/desktop/makefiles/Makefile.sources
@@ -2,7 +2,8 @@ SRC_DIR = ../../src
 DESKTOP_SRC_DIR=../shared/desktop
 AUDIO_SRC_DIR=../shared/audio
 
-SOURCES_C :=
+SOURCES_C := \
+    $(SRC_DIR)/miniz/miniz.c \
 
 SOURCES_CXX := \
     $(DESKTOP_SRC_DIR)/main.cpp \

diff --git a/platforms/windows/Geargrafx.vcxproj b/platforms/windows/Geargrafx.vcxproj
@@ -19,6 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\miniz\miniz.c" />
     <ClCompile Include="..\..\src\audio.cpp" />
     <ClCompile Include="..\..\src\cartridge.cpp" />
     <ClCompile Include="..\..\src\geargrafx_core.cpp" />
@@ -63,6 +64,7 @@
     <ClCompile Include="..\shared\desktop\renderer.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\miniz\miniz.h" />
     <ClInclude Include="..\..\src\audio_inline.h" />
     <ClInclude Include="..\..\src\audio.h" />
     <ClInclude Include="..\..\src\bit_ops.h" />
@@ -91,7 +93,7 @@
     <ClInclude Include="..\..\src\huc6280_timing.h" />
     <ClInclude Include="..\..\src\huc6280.h" />
     <ClInclude Include="..\..\src\types.h" />
-    <ClInclude Include="..\shared\audi\sound_queue.h" />
+    <ClInclude Include="..\shared\audio\sound_queue.h" />
     <ClInclude Include="..\shared\desktop\application.h" />
     <ClInclude Include="..\shared\desktop\backers.h" />
     <ClInclude Include="..\shared\desktop\config.h" />

diff --git a/platforms/windows/Geargrafx.vcxproj.filters b/platforms/windows/Geargrafx.vcxproj.filters
@@ -97,6 +97,9 @@
     <ClCompile Include="..\shared\audio\sound_queue.cpp">
       <Filter>audio</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\miniz\miniz.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\audio.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -240,9 +243,12 @@
     <ClInclude Include="..\shared\desktop\mINI\ini.h">
       <Filter>desktop\mINI</Filter>
     </ClInclude>
-    <ClInclude Include="..\shared\audi\sound_queue.h">
+    <ClInclude Include="..\shared\audio\sound_queue.h">
       <Filter>audio</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\miniz\miniz.h">
+      <Filter>src</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\audio.h">
       <Filter>src</Filter>
     </ClInclude>

diff --git a/src/cartridge.cpp b/src/cartridge.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "cartridge.h"
-#include "miniz/miniz.c"
+#include "miniz/miniz.h"
 #include "game_db.h"
 #include <string>
 #include <fstream>