RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-23 23:49:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Even more windows fixes

Browse Source
This commit is contained in:
Eric Froemling 2020-06-13 20:36:46 -07:00
parent 12e748ad8a
commit 05f87d2d41
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.efrocachemap
View File

@ -4135,16 +4135,16 @@
"assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f",
"assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338",
"assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933",
"build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f1/3b/224ab441922e2cd0f95a042eca63",
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/32/01/1382cb73f9a4484a49ba603429fc",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b4/dc/dcbe26dc38ac257f792cf10f0460",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/64/16/a4f73103c2db98225fb3c7763ea7",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/31/d7/a5fd6808a0f5031359e90d00f29b",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/28/dc/1b4b59fcf7e1b3a2fabfb6fa7762",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ae/e2/8b6983119d468b3f01f75ab377ab",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/72/c7/1b3960aeb864e2d69e7588c2fd70",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/f0/f4/0acbb407a70243e79ecd4f9c37a4",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/12/48/e5bd3c897ef27c733db9b0b97c73",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/37/b7/44fbb06655436c53351def23a7d2",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/d8/bd/05c1f7b7991300ae8e339880b19a"
"build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ff/62/5125915d72879180babf3d26b2fc",
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/dd/0f/42f87cbaceb401bed5981f137d4a",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/99/58/5a2a52d0b9d3c0fc57b90246bdb2",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/86/07/e15c1708be88dc2069d16b654624",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4c/ba/33f8898f39a83ccf6e3965828bb3",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d7/07/cf5586ecebc8360c011fa7f268eb",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/1f/87/4420eed6d8a61ba456bd958a22cb",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/00/97/dcb47fff319f0539fb65eb6d39c5",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/85/cc/001c4778eda9e1ee1ecea4c22bab",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/f1/f4/35e9d455770501d48b89cd7d5a43",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e6/d0/b26b16a1e3abc54cf9d46c1d14bf",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/58/34/9577c9876162458e59f66e72c8e5"
}

4
assets/Makefile
View File

@ -20235,5 +20235,5 @@ clean:
.PHONY: cmake win mac ios android audio clean-audio fonts clean-fonts \
data clean-data models clean-models \
clean-textures scripts clean-scripts \
assets assets-cmake assets-win assets-mac assets-ios assets-android \
asset_sources clean
assets assets-cmake assets-win-Win32 assets-win-x64 assets-mac \
assets-ios assets-android asset_sources clean

3
tools/snippets
View File

@ -597,7 +597,8 @@ def lazy_increment_build() -> None:
print(f'{Clr.SMAG}Source(s) changed; incrementing build...{Clr.RST}')
# Just go ahead and bless; this will increment the build as needed.
subprocess.run(['make', 'bless'], check=True)
# subprocess.run(['make', 'bless'], check=True)
subprocess.run(['tools/version_utils', 'incrementbuild'], check=True)
# We probably just changed code, so we need to re-calc the hash.
codehash = get_files_hash(codefiles)

2
tools/stage_assets
View File

@ -271,7 +271,7 @@ def _sync_windows_extras(cfg: Config) -> None:
# Now sync the top level individual files that we want.
# (we could technically copy everything over but this keeps staging
# dirs a bit tidier)
toplevelfiles: List[str] = []
toplevelfiles: List[str] = ['python37.dll']
if cfg.win_type == 'win':
toplevelfiles += [