diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-24 08:58:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 08:58:38 +0200 |
| commit | df5dab738a9aa35b75e439732cfc4d23e16789cd (patch) | |
| tree | 8c8eb83a3f65cfcd968518edfd308eb8096b5238 /core | |
| parent | 35d15484fea001dbe167b675098159a95e2da19b (diff) | |
| parent | a4083886233e56e423b3f75e55cced5913d1f02a (diff) | |
Merge pull request #11527 from QuLogic/system-zstd
Enable building against system zstd.
Diffstat (limited to 'core')
| -rw-r--r-- | core/SCsub | 21 | ||||
| -rw-r--r-- | core/io/compression.cpp | 2 |
2 files changed, 3 insertions, 20 deletions
diff --git a/core/SCsub b/core/SCsub index c1e57f6840..e78fe185a9 100644 --- a/core/SCsub +++ b/core/SCsub @@ -83,24 +83,8 @@ thirdparty_minizip_sources = [ thirdparty_minizip_sources = [thirdparty_minizip_dir + file for file in thirdparty_minizip_sources] env.add_source_files(env.core_sources, thirdparty_minizip_sources) -thirdparty_zstd_dir = "#thirdparty/zstd/" -thirdparty_zstd_sources = [ - "common/entropy_common.c", - "common/error_private.c", - "common/fse_decompress.c", - "common/pool.c", - "common/threading.c", - "common/xxhash.c", - "common/zstd_common.c", - "compress/fse_compress.c", - "compress/huf_compress.c", - "compress/zstd_compress.c", - "compress/zstdmt_compress.c", - "decompress/huf_decompress.c", - "decompress/zstd_decompress.c", -] -thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources] -env.add_source_files(env.core_sources, thirdparty_zstd_sources) +if "builtin_zstd" in env and env["builtin_zstd"] == "yes": + SConscript("#thirdparty/zstd/SCsub") # Godot's own sources @@ -123,5 +107,4 @@ SConscript('helper/SCsub') # Build it all as a library lib = env.Library("core", env.core_sources) env.Prepend(LIBS=[lib]) -env.Append(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"]) Export('env') diff --git a/core/io/compression.cpp b/core/io/compression.cpp index 44fa65e11d..fbe97e54c7 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -33,9 +33,9 @@ #include "zip_io.h" #include "thirdparty/misc/fastlz.h" -#include "thirdparty/zstd/zstd.h" #include <zlib.h> +#include <zstd.h> int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode) { |