Jan Engelhardt 2024-04-30 11:24:40 +00:00 committed by Git OBS Bridge
parent 36533034f7
commit 93a40355be

View File

@ -10,7 +10,7 @@ This reverts commit ba9ce0e83f6e25e3ddef5000bd51d53f2e3947a2.
src/common/audio/music/i_music.cpp | 2 +-
src/common/engine/serializer.cpp | 2 +-
src/common/filesystem/source/files_decompress.cpp | 2 +-
src/common/filesystem/source/filesystem.cpp | 2 +-
src/common/filesystem/source/filesystem.cpp | 3 ++-
src/common/filesystem/source/resourcefile.cpp | 2 +-
src/common/models/model.cpp | 13 +++++++++++--
src/common/platform/win32/i_crash.cpp | 2 +-
@ -23,7 +23,7 @@ This reverts commit ba9ce0e83f6e25e3ddef5000bd51d53f2e3947a2.
tools/zipdir/CMakeLists.txt | 4 ++--
tools/zipdir/zipdir.c | 2 +-
vcpkg.json | 4 ++++
18 files changed, 46 insertions(+), 21 deletions(-)
18 files changed, 47 insertions(+), 21 deletions(-)
Index: gzdoom-g4.12.2/CMakeLists.txt
===================================================================
@ -135,11 +135,12 @@ Index: gzdoom-g4.12.2/src/common/filesystem/source/filesystem.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/common/filesystem/source/filesystem.cpp
+++ gzdoom-g4.12.2/src/common/filesystem/source/filesystem.cpp
@@ -36,7 +36,7 @@
@@ -36,7 +36,8 @@
// HEADER FILES ------------------------------------------------------------
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include <stdlib.h>
#include <ctype.h>