yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move miniz into a subdirectory.

Browse source 
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.
This commit is contained in:
Yamagi 2023-11-23 18:21:44 +01:00
parent 2b06ae4e95
commit 90402c3f85
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -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
)

4
Makefile
View file

@ -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 \

2
src/client/vid/vid.c
View file

@ -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)

4
src/common/unzip/ioapi.h
View file

@ -43,8 +43,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "miniz.h"
#include "minizconf.h"
#include "miniz/miniz.h"
#include "miniz/minizconf.h"
#if defined(USE_FILE32API)
#define fopen64 fopen

0
src/common/unzip/miniz.c → src/common/unzip/miniz/miniz.c
View file

0
src/common/unzip/miniz.h → src/common/unzip/miniz/miniz.h
View file

0
src/common/unzip/minizconf.h → src/common/unzip/miniz/minizconf.h
View file

4
src/common/unzip/unzip.c
View file

@ -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

4
src/common/unzip/unzip.h
View file

@ -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"