From 8c16c2b818a304d131e2e08444da48835d4f8cc5 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sat, 1 Aug 2020 14:02:57 -0700 Subject: [PATCH] Added ucrtbased.dll for win debug prefab builds --- .efrocachemap | 1 + assets/.asset_manifest_private.json | 2 ++ assets/Makefile | 2 ++ tools/batools/assetstaging.py | 7 +++++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 2a7fce1c..1192d95d 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3924,6 +3924,7 @@ "assets/build/windows/Win32/python_d.exe": "https://files.ballistica.net/cache/ba1/57/2f/7cda5f442a832f8f92fc76e8370d", "assets/build/windows/Win32/pythonw.exe": "https://files.ballistica.net/cache/ba1/3b/01/7819c084c81c84562a2dab70033e", "assets/build/windows/Win32/pythonw_d.exe": "https://files.ballistica.net/cache/ba1/4b/df/7ebb1be3e018abc04660d932a7b2", + "assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450", "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/5a/b6/9438d9e41b904ee9eae03cf75c6a", diff --git a/assets/.asset_manifest_private.json b/assets/.asset_manifest_private.json index f5e9ff9f..ed6eeb97 100644 --- a/assets/.asset_manifest_private.json +++ b/assets/.asset_manifest_private.json @@ -5233,6 +5233,7 @@ "windows/Win32/python_d.exe", "windows/Win32/pythonw.exe", "windows/Win32/pythonw_d.exe", + "windows/Win32/ucrtbased.dll", "windows/Win32/vc_redist.x86.exe", "windows/Win32/vcruntime140d.dll", "windows/x64/DLLs/_asyncio.pyd", @@ -6177,6 +6178,7 @@ "windows/x64/python_d.exe", "windows/x64/pythonw.exe", "windows/x64/pythonw_d.exe", + "windows/x64/ucrtbased.dll", "windows/x64/vc_redist.x64.exe", "windows/x64/vcruntime140_1d.dll", "windows/x64/vcruntime140d.dll" diff --git a/assets/Makefile b/assets/Makefile index 31615346..09fcfea4 100644 --- a/assets/Makefile +++ b/assets/Makefile @@ -6876,6 +6876,7 @@ EXTRAS_TARGETS_WIN_WIN32 = \ build/windows/Win32/python_d.exe \ build/windows/Win32/pythonw.exe \ build/windows/Win32/pythonw_d.exe \ + build/windows/Win32/ucrtbased.dll \ build/windows/Win32/vc_redist.x86.exe \ build/windows/Win32/vcruntime140d.dll @@ -6961,6 +6962,7 @@ EXTRAS_TARGETS_WIN_X64 = \ build/windows/x64/python_d.exe \ build/windows/x64/pythonw.exe \ build/windows/x64/pythonw_d.exe \ + build/windows/x64/ucrtbased.dll \ build/windows/x64/vc_redist.x64.exe \ build/windows/x64/vcruntime140_1d.dll \ build/windows/x64/vcruntime140d.dll diff --git a/tools/batools/assetstaging.py b/tools/batools/assetstaging.py index 7c328b11..dbe76f1f 100755 --- a/tools/batools/assetstaging.py +++ b/tools/batools/assetstaging.py @@ -287,10 +287,13 @@ def _sync_windows_extras(cfg: Config) -> None: if cfg.debug: if cfg.win_platform == 'x64': toplevelfiles += [ - 'msvcp140d.dll', 'vcruntime140d.dll', 'vcruntime140_1d.dll' + 'msvcp140d.dll', 'vcruntime140d.dll', 'vcruntime140_1d.dll', + 'ucrtbased.dll' ] else: - toplevelfiles += ['msvcp140d.dll', 'vcruntime140d.dll'] + toplevelfiles += [ + 'msvcp140d.dll', 'vcruntime140d.dll', 'ucrtbased.dll' + ] # Include the runtime redistributables in release builds. if not cfg.debug: