From a7f6040e05eb2f943a600fefc41e3c13c728b2bf Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 16 Dec 2023 17:58:14 +0100 Subject: [PATCH] Moved zlib to core. --- core/SCsub | 2 +- {thirdparty => core/thirdparty}/zlib/LICENSE | 0 {thirdparty => core/thirdparty}/zlib/adler32.c | 0 {thirdparty => core/thirdparty}/zlib/compress.c | 0 {thirdparty => core/thirdparty}/zlib/crc32.c | 0 {thirdparty => core/thirdparty}/zlib/crc32.h | 0 {thirdparty => core/thirdparty}/zlib/deflate.c | 0 {thirdparty => core/thirdparty}/zlib/deflate.h | 0 {thirdparty => core/thirdparty}/zlib/gzclose.c | 0 {thirdparty => core/thirdparty}/zlib/gzguts.h | 0 {thirdparty => core/thirdparty}/zlib/gzlib.c | 0 {thirdparty => core/thirdparty}/zlib/gzread.c | 0 {thirdparty => core/thirdparty}/zlib/gzwrite.c | 0 {thirdparty => core/thirdparty}/zlib/infback.c | 0 {thirdparty => core/thirdparty}/zlib/inffast.c | 0 {thirdparty => core/thirdparty}/zlib/inffast.h | 0 {thirdparty => core/thirdparty}/zlib/inffixed.h | 0 {thirdparty => core/thirdparty}/zlib/inflate.c | 0 {thirdparty => core/thirdparty}/zlib/inflate.h | 0 {thirdparty => core/thirdparty}/zlib/inftrees.c | 0 {thirdparty => core/thirdparty}/zlib/inftrees.h | 0 {thirdparty => core/thirdparty}/zlib/trees.c | 0 {thirdparty => core/thirdparty}/zlib/trees.h | 0 {thirdparty => core/thirdparty}/zlib/uncompr.c | 0 {thirdparty => core/thirdparty}/zlib/zconf.h | 0 {thirdparty => core/thirdparty}/zlib/zlib.h | 0 {thirdparty => core/thirdparty}/zlib/zutil.c | 0 {thirdparty => core/thirdparty}/zlib/zutil.h | 0 scu_builders.py | 2 +- 29 files changed, 2 insertions(+), 2 deletions(-) rename {thirdparty => core/thirdparty}/zlib/LICENSE (100%) rename {thirdparty => core/thirdparty}/zlib/adler32.c (100%) rename {thirdparty => core/thirdparty}/zlib/compress.c (100%) rename {thirdparty => core/thirdparty}/zlib/crc32.c (100%) rename {thirdparty => core/thirdparty}/zlib/crc32.h (100%) rename {thirdparty => core/thirdparty}/zlib/deflate.c (100%) rename {thirdparty => core/thirdparty}/zlib/deflate.h (100%) rename {thirdparty => core/thirdparty}/zlib/gzclose.c (100%) rename {thirdparty => core/thirdparty}/zlib/gzguts.h (100%) rename {thirdparty => core/thirdparty}/zlib/gzlib.c (100%) rename {thirdparty => core/thirdparty}/zlib/gzread.c (100%) rename {thirdparty => core/thirdparty}/zlib/gzwrite.c (100%) rename {thirdparty => core/thirdparty}/zlib/infback.c (100%) rename {thirdparty => core/thirdparty}/zlib/inffast.c (100%) rename {thirdparty => core/thirdparty}/zlib/inffast.h (100%) rename {thirdparty => core/thirdparty}/zlib/inffixed.h (100%) rename {thirdparty => core/thirdparty}/zlib/inflate.c (100%) rename {thirdparty => core/thirdparty}/zlib/inflate.h (100%) rename {thirdparty => core/thirdparty}/zlib/inftrees.c (100%) rename {thirdparty => core/thirdparty}/zlib/inftrees.h (100%) rename {thirdparty => core/thirdparty}/zlib/trees.c (100%) rename {thirdparty => core/thirdparty}/zlib/trees.h (100%) rename {thirdparty => core/thirdparty}/zlib/uncompr.c (100%) rename {thirdparty => core/thirdparty}/zlib/zconf.h (100%) rename {thirdparty => core/thirdparty}/zlib/zlib.h (100%) rename {thirdparty => core/thirdparty}/zlib/zutil.c (100%) rename {thirdparty => core/thirdparty}/zlib/zutil.h (100%) diff --git a/core/SCsub b/core/SCsub index 1bd50cf..2b25e36 100644 --- a/core/SCsub +++ b/core/SCsub @@ -66,7 +66,7 @@ env_thirdparty.add_source_files(thirdparty_obj, thirdparty_misc_sources) # Zlib library, can be unbundled if env["builtin_zlib"]: - thirdparty_zlib_dir = "#thirdparty/zlib/" + thirdparty_zlib_dir = "thirdparty/zlib/" thirdparty_zlib_sources = [ "adler32.c", "compress.c", diff --git a/thirdparty/zlib/LICENSE b/core/thirdparty/zlib/LICENSE similarity index 100% rename from thirdparty/zlib/LICENSE rename to core/thirdparty/zlib/LICENSE diff --git a/thirdparty/zlib/adler32.c b/core/thirdparty/zlib/adler32.c similarity index 100% rename from thirdparty/zlib/adler32.c rename to core/thirdparty/zlib/adler32.c diff --git a/thirdparty/zlib/compress.c b/core/thirdparty/zlib/compress.c similarity index 100% rename from thirdparty/zlib/compress.c rename to core/thirdparty/zlib/compress.c diff --git a/thirdparty/zlib/crc32.c b/core/thirdparty/zlib/crc32.c similarity index 100% rename from thirdparty/zlib/crc32.c rename to core/thirdparty/zlib/crc32.c diff --git a/thirdparty/zlib/crc32.h b/core/thirdparty/zlib/crc32.h similarity index 100% rename from thirdparty/zlib/crc32.h rename to core/thirdparty/zlib/crc32.h diff --git a/thirdparty/zlib/deflate.c b/core/thirdparty/zlib/deflate.c similarity index 100% rename from thirdparty/zlib/deflate.c rename to core/thirdparty/zlib/deflate.c diff --git a/thirdparty/zlib/deflate.h b/core/thirdparty/zlib/deflate.h similarity index 100% rename from thirdparty/zlib/deflate.h rename to core/thirdparty/zlib/deflate.h diff --git a/thirdparty/zlib/gzclose.c b/core/thirdparty/zlib/gzclose.c similarity index 100% rename from thirdparty/zlib/gzclose.c rename to core/thirdparty/zlib/gzclose.c diff --git a/thirdparty/zlib/gzguts.h b/core/thirdparty/zlib/gzguts.h similarity index 100% rename from thirdparty/zlib/gzguts.h rename to core/thirdparty/zlib/gzguts.h diff --git a/thirdparty/zlib/gzlib.c b/core/thirdparty/zlib/gzlib.c similarity index 100% rename from thirdparty/zlib/gzlib.c rename to core/thirdparty/zlib/gzlib.c diff --git a/thirdparty/zlib/gzread.c b/core/thirdparty/zlib/gzread.c similarity index 100% rename from thirdparty/zlib/gzread.c rename to core/thirdparty/zlib/gzread.c diff --git a/thirdparty/zlib/gzwrite.c b/core/thirdparty/zlib/gzwrite.c similarity index 100% rename from thirdparty/zlib/gzwrite.c rename to core/thirdparty/zlib/gzwrite.c diff --git a/thirdparty/zlib/infback.c b/core/thirdparty/zlib/infback.c similarity index 100% rename from thirdparty/zlib/infback.c rename to core/thirdparty/zlib/infback.c diff --git a/thirdparty/zlib/inffast.c b/core/thirdparty/zlib/inffast.c similarity index 100% rename from thirdparty/zlib/inffast.c rename to core/thirdparty/zlib/inffast.c diff --git a/thirdparty/zlib/inffast.h b/core/thirdparty/zlib/inffast.h similarity index 100% rename from thirdparty/zlib/inffast.h rename to core/thirdparty/zlib/inffast.h diff --git a/thirdparty/zlib/inffixed.h b/core/thirdparty/zlib/inffixed.h similarity index 100% rename from thirdparty/zlib/inffixed.h rename to core/thirdparty/zlib/inffixed.h diff --git a/thirdparty/zlib/inflate.c b/core/thirdparty/zlib/inflate.c similarity index 100% rename from thirdparty/zlib/inflate.c rename to core/thirdparty/zlib/inflate.c diff --git a/thirdparty/zlib/inflate.h b/core/thirdparty/zlib/inflate.h similarity index 100% rename from thirdparty/zlib/inflate.h rename to core/thirdparty/zlib/inflate.h diff --git a/thirdparty/zlib/inftrees.c b/core/thirdparty/zlib/inftrees.c similarity index 100% rename from thirdparty/zlib/inftrees.c rename to core/thirdparty/zlib/inftrees.c diff --git a/thirdparty/zlib/inftrees.h b/core/thirdparty/zlib/inftrees.h similarity index 100% rename from thirdparty/zlib/inftrees.h rename to core/thirdparty/zlib/inftrees.h diff --git a/thirdparty/zlib/trees.c b/core/thirdparty/zlib/trees.c similarity index 100% rename from thirdparty/zlib/trees.c rename to core/thirdparty/zlib/trees.c diff --git a/thirdparty/zlib/trees.h b/core/thirdparty/zlib/trees.h similarity index 100% rename from thirdparty/zlib/trees.h rename to core/thirdparty/zlib/trees.h diff --git a/thirdparty/zlib/uncompr.c b/core/thirdparty/zlib/uncompr.c similarity index 100% rename from thirdparty/zlib/uncompr.c rename to core/thirdparty/zlib/uncompr.c diff --git a/thirdparty/zlib/zconf.h b/core/thirdparty/zlib/zconf.h similarity index 100% rename from thirdparty/zlib/zconf.h rename to core/thirdparty/zlib/zconf.h diff --git a/thirdparty/zlib/zlib.h b/core/thirdparty/zlib/zlib.h similarity index 100% rename from thirdparty/zlib/zlib.h rename to core/thirdparty/zlib/zlib.h diff --git a/thirdparty/zlib/zutil.c b/core/thirdparty/zlib/zutil.c similarity index 100% rename from thirdparty/zlib/zutil.c rename to core/thirdparty/zlib/zutil.c diff --git a/thirdparty/zlib/zutil.h b/core/thirdparty/zlib/zutil.h similarity index 100% rename from thirdparty/zlib/zutil.h rename to core/thirdparty/zlib/zutil.h diff --git a/scu_builders.py b/scu_builders.py index 353b8b3..ae43432 100644 --- a/scu_builders.py +++ b/scu_builders.py @@ -292,7 +292,7 @@ def generate_scu_files(verbose, is_release_build, env): "os", "string", "variant", "io", "crypto"]) else: process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object", - "os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc", "thirdparty/zstd"], [], 0, "cpp c") + "os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc", "thirdparty/zstd", "thirdparty/zlib"], [], 0, "cpp c") #process_folder(["drivers/gles2"], [], 0, "cpp c") #process_folder(["drivers/unix"], [], 0, "cpp c")