diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/extlib.lua | 6 | ||||
-rwxr-xr-x | scripts/src/3rdparty.lua | 63 | ||||
-rw-r--r-- | scripts/src/lib.lua | 1 | ||||
-rw-r--r-- | scripts/src/main.lua | 1 | ||||
-rw-r--r-- | scripts/src/tools.lua | 9 |
5 files changed, 75 insertions, 5 deletions
diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 5ff8ab2ecb4..6d80717eb95 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -9,6 +9,7 @@ local extlibs = { asio = { "asio", "3rdparty/asio/include" }, expat = { "expat", "3rdparty/expat/lib" }, zlib = { "z", "3rdparty/zlib" }, + zstd = { "zstd", "3rdparty/zstd/lib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, flac = { "FLAC", "3rdparty/flac/include" }, sqlite3 = { "sqlite3", "3rdparty/sqlite3" }, @@ -38,6 +39,11 @@ newoption { } newoption { + trigger = 'with-system-zstd', + description = 'Use system Zstandard library', +} + +newoption { trigger = 'with-system-jpeg', description = 'Use system JPEG library', } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index b0ebea6d943..64a8e3b7ab6 100755 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -168,6 +168,63 @@ end -------------------------------------------------- +-- zstd library objects +-------------------------------------------------- + +if not _OPTIONS["with-system-zstd"] then +project "zstd" + uuid "5edd8713-bc60-456d-9c95-b928a913c84b" + kind "StaticLib" + + configuration { "Release" } + defines { + "NDEBUG", + } + + configuration { } + + defines { + "XXH_NAMESPACE=ZSTD_", + "DEBUGLEVEL=0", + "ZSTD_DISABLE_ASM", + } + + files { + MAME_DIR .. "3rdparty/zstd/lib/common/debug.c", + MAME_DIR .. "3rdparty/zstd/lib/common/entropy_common.c", + MAME_DIR .. "3rdparty/zstd/lib/common/error_private.c", + MAME_DIR .. "3rdparty/zstd/lib/common/fse_decompress.c", + MAME_DIR .. "3rdparty/zstd/lib/common/pool.c", + MAME_DIR .. "3rdparty/zstd/lib/common/threading.c", + MAME_DIR .. "3rdparty/zstd/lib/common/xxhash.c", + MAME_DIR .. "3rdparty/zstd/lib/common/zstd_common.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/fse_compress.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/hist.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/huf_compress.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_compress.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_compress_literals.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_compress_sequences.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_compress_superblock.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_double_fast.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_fast.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_lazy.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_ldm.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstdmt_compress.c", + MAME_DIR .. "3rdparty/zstd/lib/compress/zstd_opt.c", + --MAME_DIR .. "3rdparty/zstd/lib/decompress/huf_decompress_amd64.S", only supports GCC-like assemblers and SysV calling convention + MAME_DIR .. "3rdparty/zstd/lib/decompress/huf_decompress.c", + MAME_DIR .. "3rdparty/zstd/lib/decompress/zstd_ddict.c", + MAME_DIR .. "3rdparty/zstd/lib/decompress/zstd_decompress_block.c", + MAME_DIR .. "3rdparty/zstd/lib/decompress/zstd_decompress.c", + } +else +links { + ext_lib("zstd"), +} +end + + +-------------------------------------------------- -- SoftFloat library objects -------------------------------------------------- @@ -671,13 +728,9 @@ end "HAVE_FSEEKO", } - configuration { "Release" } - defines { - "NDEBUG", - } - configuration { } defines { + "NDEBUG", -- always enable this to avoid debug log spam on compression "HAVE_CONFIG_H", -- mostly because PACKAGE_VERSION is a pain to do otherwise "ENABLE_64_BIT_WORDS=1", "OGG_FOUND=0", diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index a2516243c3c..5196e579d12 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -21,6 +21,7 @@ project "utils" MAME_DIR .. "3rdparty", ext_includedir("expat"), ext_includedir("zlib"), + ext_includedir("zstd"), ext_includedir("flac"), ext_includedir("utf8proc"), } diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 53b496cdfad..0192d849676 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -165,6 +165,7 @@ if (STANDALONE~=true) then end links { ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 6b30fc951c0..3914a8f4191 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -31,6 +31,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("utf8proc"), } @@ -72,6 +73,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -160,6 +162,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -205,6 +208,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -251,6 +255,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -377,6 +382,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -554,6 +560,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -598,6 +605,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -645,6 +653,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } |