Moved minizip to core.

This commit is contained in:
Relintai 2023-12-16 18:09:48 +01:00
parent 11e880e8d9
commit 6af0e3505f
14 changed files with 5 additions and 5 deletions

View File

@ -92,7 +92,7 @@ if env["builtin_zlib"]:
# Minizip library, could be unbundled in theory # Minizip library, could be unbundled in theory
# However, our version has some custom modifications, so it won't compile with the system one # 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 = [ thirdparty_minizip_sources = [
"ioapi.c", "ioapi.c",
"unzip.c", "unzip.c",

View File

@ -35,7 +35,7 @@
#include "core/io/file_access_pack.h" #include "core/io/file_access_pack.h"
#include "core/containers/rb_map.h" #include "core/containers/rb_map.h"
#include "thirdparty/minizip/unzip.h" #include "core/thirdparty/minizip/unzip.h"
#include <stdlib.h> #include <stdlib.h>

View File

@ -35,8 +35,8 @@
// Not directly used in this header, but assumed available in downstream users // 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 // like platform/*/export/export.cpp. Could be fixed, but probably better to have
// thirdparty includes in as little headers as possible. // thirdparty includes in as little headers as possible.
#include "thirdparty/minizip/unzip.h" #include "core/thirdparty/minizip/unzip.h"
#include "thirdparty/minizip/zip.h" #include "core/thirdparty/minizip/zip.h"
void *zipio_open(void *data, const char *p_fname, int mode); void *zipio_open(void *data, const char *p_fname, int mode);
uLong zipio_read(void *data, void *fdata, void *buf, uLong size); uLong zipio_read(void *data, void *fdata, void *buf, uLong size);

View File

@ -293,7 +293,7 @@ def generate_scu_files(verbose, is_release_build, env):
else: else:
process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object", process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object",
"os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc", "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/gles2"], [], 0, "cpp c")
#process_folder(["drivers/unix"], [], 0, "cpp c") #process_folder(["drivers/unix"], [], 0, "cpp c")