mirror of
https://github.com/Relintai/pandemonium_engine_minimal.git
synced 2024-11-10 20:12:10 +01:00
Moved minizip to core.
This commit is contained in:
parent
11e880e8d9
commit
6af0e3505f
@ -92,7 +92,7 @@ if env["builtin_zlib"]:
|
||||
|
||||
# Minizip library, could be unbundled in theory
|
||||
# However, our version has some custom modifications, so it won't compile with the system one
|
||||
thirdparty_minizip_dir = "#thirdparty/minizip/"
|
||||
thirdparty_minizip_dir = "thirdparty/minizip/"
|
||||
thirdparty_minizip_sources = [
|
||||
"ioapi.c",
|
||||
"unzip.c",
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include "core/io/file_access_pack.h"
|
||||
#include "core/containers/rb_map.h"
|
||||
|
||||
#include "thirdparty/minizip/unzip.h"
|
||||
#include "core/thirdparty/minizip/unzip.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
@ -35,8 +35,8 @@
|
||||
// Not directly used in this header, but assumed available in downstream users
|
||||
// like platform/*/export/export.cpp. Could be fixed, but probably better to have
|
||||
// thirdparty includes in as little headers as possible.
|
||||
#include "thirdparty/minizip/unzip.h"
|
||||
#include "thirdparty/minizip/zip.h"
|
||||
#include "core/thirdparty/minizip/unzip.h"
|
||||
#include "core/thirdparty/minizip/zip.h"
|
||||
|
||||
void *zipio_open(void *data, const char *p_fname, int mode);
|
||||
uLong zipio_read(void *data, void *fdata, void *buf, uLong size);
|
||||
|
@ -293,7 +293,7 @@ def generate_scu_files(verbose, is_release_build, env):
|
||||
else:
|
||||
process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object",
|
||||
"os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc",
|
||||
"thirdparty/zstd", "thirdparty/zlib"], [], 0, "cpp c")
|
||||
"thirdparty/zstd", "thirdparty/zlib", "thirdparty/minizip"], [], 0, "cpp c")
|
||||
|
||||
#process_folder(["drivers/gles2"], [], 0, "cpp c")
|
||||
#process_folder(["drivers/unix"], [], 0, "cpp c")
|
||||
|
Loading…
Reference in New Issue
Block a user