From 90402c3f857edd4c14f633a4c9a53f922502ca27 Mon Sep 17 00:00:00 2001 From: Yamagi Date: Thu, 23 Nov 2023 18:21:44 +0100 Subject: [PATCH] Move miniz into a subdirectory. An upcoming update will add several files, having miniz in it's own subdirectory makes it clear what belongs to it an whit to unzip. --- CMakeLists.txt | 12 ++++++------ Makefile | 4 ++-- src/client/vid/vid.c | 2 +- src/common/unzip/ioapi.h | 4 ++-- src/common/unzip/{ => miniz}/miniz.c | 0 src/common/unzip/{ => miniz}/miniz.h | 0 src/common/unzip/{ => miniz}/minizconf.h | 0 src/common/unzip/unzip.c | 4 ++-- src/common/unzip/unzip.h | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) rename src/common/unzip/{ => miniz}/miniz.c (100%) rename src/common/unzip/{ => miniz}/miniz.h (100%) rename src/common/unzip/{ => miniz}/minizconf.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86b5df74..979fd729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -461,8 +461,8 @@ set(Client-Source ${COMMON_SRC_DIR}/shared/rand.c ${COMMON_SRC_DIR}/shared/shared.c ${COMMON_SRC_DIR}/unzip/ioapi.c - ${COMMON_SRC_DIR}/unzip/miniz.c ${COMMON_SRC_DIR}/unzip/unzip.c + ${COMMON_SRC_DIR}/unzip/miniz/miniz.c ${SERVER_SRC_DIR}/sv_cmd.c ${SERVER_SRC_DIR}/sv_conless.c ${SERVER_SRC_DIR}/sv_entities.c @@ -499,9 +499,9 @@ set(Client-Header ${COMMON_SRC_DIR}/header/shared.h ${COMMON_SRC_DIR}/header/zone.h ${COMMON_SRC_DIR}/unzip/ioapi.h - ${COMMON_SRC_DIR}/unzip/miniz.h - ${COMMON_SRC_DIR}/unzip/minizconf.h ${COMMON_SRC_DIR}/unzip/unzip.h + ${COMMON_SRC_DIR}/unzip/miniz/miniz.h + ${COMMON_SRC_DIR}/unzip/miniz/minizconf.h ${SERVER_SRC_DIR}/header/server.h ) @@ -524,8 +524,8 @@ set(Server-Source ${COMMON_SRC_DIR}/shared/rand.c ${COMMON_SRC_DIR}/shared/shared.c ${COMMON_SRC_DIR}/unzip/ioapi.c - ${COMMON_SRC_DIR}/unzip/miniz.c ${COMMON_SRC_DIR}/unzip/unzip.c + ${COMMON_SRC_DIR}/unzip/miniz/miniz.c ${SERVER_SRC_DIR}/sv_cmd.c ${SERVER_SRC_DIR}/sv_conless.c ${SERVER_SRC_DIR}/sv_entities.c @@ -546,9 +546,9 @@ set(Server-Header ${COMMON_SRC_DIR}/header/shared.h ${COMMON_SRC_DIR}/header/zone.h ${COMMON_SRC_DIR}/unzip/ioapi.h - ${COMMON_SRC_DIR}/unzip/miniz.h - ${COMMON_SRC_DIR}/unzip/minizconf.h ${COMMON_SRC_DIR}/unzip/unzip.h + ${COMMON_SRC_DIR}/unzip/miniz/miniz.h + ${COMMON_SRC_DIR}/unzip/miniz/minizconf.h ${SERVER_SRC_DIR}/header/server.h ) diff --git a/Makefile b/Makefile index 98643500..6fb2ded6 100644 --- a/Makefile +++ b/Makefile @@ -883,8 +883,8 @@ CLIENT_OBJS_ := \ src/common/shared/rand.o \ src/common/shared/shared.o \ src/common/unzip/ioapi.o \ - src/common/unzip/miniz.o \ src/common/unzip/unzip.o \ + src/common/unzip/miniz/miniz.o \ src/server/sv_cmd.o \ src/server/sv_conless.o \ src/server/sv_entities.o \ @@ -1042,8 +1042,8 @@ SERVER_OBJS_ := \ src/common/shared/rand.o \ src/common/shared/shared.o \ src/common/unzip/ioapi.o \ - src/common/unzip/miniz.o \ src/common/unzip/unzip.o \ + src/common/unzip/miniz/miniz.o \ src/server/sv_cmd.o \ src/server/sv_conless.o \ src/server/sv_entities.o \ diff --git a/src/client/vid/vid.c b/src/client/vid/vid.c index 12cc6e86..d48a61ef 100644 --- a/src/client/vid/vid.c +++ b/src/client/vid/vid.c @@ -35,7 +35,7 @@ // Screenshots // ----------- -#include "../../common/unzip/miniz.h" +#include "../../common/unzip/miniz/miniz.h" static unsigned char* compress_for_stbiw(unsigned char *data, int data_len, int *out_len, int quality) diff --git a/src/common/unzip/ioapi.h b/src/common/unzip/ioapi.h index 531c2576..49f7bbe8 100644 --- a/src/common/unzip/ioapi.h +++ b/src/common/unzip/ioapi.h @@ -43,8 +43,8 @@ #include #include -#include "miniz.h" -#include "minizconf.h" +#include "miniz/miniz.h" +#include "miniz/minizconf.h" #if defined(USE_FILE32API) #define fopen64 fopen diff --git a/src/common/unzip/miniz.c b/src/common/unzip/miniz/miniz.c similarity index 100% rename from src/common/unzip/miniz.c rename to src/common/unzip/miniz/miniz.c diff --git a/src/common/unzip/miniz.h b/src/common/unzip/miniz/miniz.h similarity index 100% rename from src/common/unzip/miniz.h rename to src/common/unzip/miniz/miniz.h diff --git a/src/common/unzip/minizconf.h b/src/common/unzip/miniz/minizconf.h similarity index 100% rename from src/common/unzip/minizconf.h rename to src/common/unzip/miniz/minizconf.h diff --git a/src/common/unzip/unzip.c b/src/common/unzip/unzip.c index 4f4a36e9..f4de2340 100644 --- a/src/common/unzip/unzip.c +++ b/src/common/unzip/unzip.c @@ -72,8 +72,8 @@ #define NOUNCRYPT #endif -#include "miniz.h" -#include "minizconf.h" +#include "miniz/miniz.h" +#include "miniz/minizconf.h" #include "unzip.h" #ifdef STDC diff --git a/src/common/unzip/unzip.h b/src/common/unzip/unzip.h index 2eb3603d..f7d2464f 100644 --- a/src/common/unzip/unzip.h +++ b/src/common/unzip/unzip.h @@ -47,8 +47,8 @@ extern "C" { #endif -#include "miniz.h" -#include "minizconf.h" +#include "miniz/miniz.h" +#include "miniz/minizconf.h" #ifndef _ZLIBIOAPI_H #include "ioapi.h"