diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-09-23 23:46:47 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-09-23 23:46:47 -0400 |
| commit | a4083886233e56e423b3f75e55cced5913d1f02a (patch) | |
| tree | a8126b3f6fba38e6e21a3bbf77bfe16a2f177b98 /core/SCsub | |
| parent | 30a25b7d0333bf4d00cb09244426f17338fcdf59 (diff) | |
Enable building against system zstd.
Diffstat (limited to 'core/SCsub')
| -rw-r--r-- | core/SCsub | 21 |
1 files changed, 2 insertions, 19 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') |