Moved zlib to core.

2024-11-17 22:17:19 +01:00 · 2023-12-16 17:58:14 +01:00 · 2023-12-16 17:58:14 +01:00 · a7f6040e05
commit a7f6040e05
parent f05996c037
29 changed files with 2 additions and 2 deletions
--- 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",
--- a/core/thirdparty/zlib/LICENSE
+++ b/core/thirdparty/zlib/LICENSE
--- a/core/thirdparty/zlib/adler32.c
+++ b/core/thirdparty/zlib/adler32.c
--- a/core/thirdparty/zlib/compress.c
+++ b/core/thirdparty/zlib/compress.c
--- a/core/thirdparty/zlib/crc32.c
+++ b/core/thirdparty/zlib/crc32.c
--- a/core/thirdparty/zlib/crc32.h
+++ b/core/thirdparty/zlib/crc32.h
--- a/core/thirdparty/zlib/deflate.c
+++ b/core/thirdparty/zlib/deflate.c
--- a/core/thirdparty/zlib/deflate.h
+++ b/core/thirdparty/zlib/deflate.h
--- a/core/thirdparty/zlib/gzclose.c
+++ b/core/thirdparty/zlib/gzclose.c
--- a/core/thirdparty/zlib/gzguts.h
+++ b/core/thirdparty/zlib/gzguts.h
--- a/core/thirdparty/zlib/gzlib.c
+++ b/core/thirdparty/zlib/gzlib.c
--- a/core/thirdparty/zlib/gzread.c
+++ b/core/thirdparty/zlib/gzread.c
--- a/core/thirdparty/zlib/gzwrite.c
+++ b/core/thirdparty/zlib/gzwrite.c
--- a/core/thirdparty/zlib/infback.c
+++ b/core/thirdparty/zlib/infback.c
--- a/core/thirdparty/zlib/inffast.c
+++ b/core/thirdparty/zlib/inffast.c
--- a/core/thirdparty/zlib/inffast.h
+++ b/core/thirdparty/zlib/inffast.h
--- a/core/thirdparty/zlib/inffixed.h
+++ b/core/thirdparty/zlib/inffixed.h
--- a/core/thirdparty/zlib/inflate.c
+++ b/core/thirdparty/zlib/inflate.c
--- a/core/thirdparty/zlib/inflate.h
+++ b/core/thirdparty/zlib/inflate.h
--- a/core/thirdparty/zlib/inftrees.c
+++ b/core/thirdparty/zlib/inftrees.c
--- a/core/thirdparty/zlib/inftrees.h
+++ b/core/thirdparty/zlib/inftrees.h
--- a/core/thirdparty/zlib/trees.c
+++ b/core/thirdparty/zlib/trees.c
--- a/core/thirdparty/zlib/trees.h
+++ b/core/thirdparty/zlib/trees.h
--- a/core/thirdparty/zlib/uncompr.c
+++ b/core/thirdparty/zlib/uncompr.c
--- a/core/thirdparty/zlib/zconf.h
+++ b/core/thirdparty/zlib/zconf.h
--- a/core/thirdparty/zlib/zlib.h
+++ b/core/thirdparty/zlib/zlib.h
--- a/core/thirdparty/zlib/zutil.c
+++ b/core/thirdparty/zlib/zutil.c
--- a/core/thirdparty/zlib/zutil.h
+++ b/core/thirdparty/zlib/zutil.h
--- 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")