RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-03 05:53:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few tool fixes for running under WSL

Browse Source
This commit is contained in:
efroemling 2019-10-20 16:07:27 -07:00
parent b4edd9a9cd
commit 30ea7e3508
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/snippets
View File

@ -646,17 +646,23 @@ def make_prefab() -> None:
system = platform.system() system = platform.system()
machine = platform.machine() machine = platform.machine()
if system == 'Darwin': if system == 'Darwin':
# Currently there's just x86_64 on mac; will need to revisit when arm # Currently there's just x86_64 on mac; will need to revisit when arm
# cpus happen. # cpus happen.
base = 'mac' base = 'mac'
elif system == 'Linux': elif system == 'Linux':
# We currently only support x86_64 linux. # If it looks like we're in Windows Subsystem for Linux,
if machine == 'x86_64': # go with the Windows version.
base = 'linux' if 'microsoft' in platform.uname()[3].lower():
base = 'windows'
else: else:
raise RuntimeError(f'make_prefab: unsupported linux machine type:' # We currently only support x86_64 linux.
f' {machine}.') if machine == 'x86_64':
base = 'linux'
else:
raise RuntimeError(f'make_prefab: unsupported linux machine type:'
f' {machine}.')
else: else:
raise RuntimeError(f'make_prefab: unrecognized platform:' raise RuntimeError(f'make_prefab: unrecognized platform:'
f' {platform.system()}.') f' {platform.system()}.')

3
tools/stage_assets
View File

@ -250,7 +250,8 @@ def _sync_windows_extras(cfg: Config) -> str:
_run(cmd) _run(cmd)
# Now sync the top level individual files. # Now sync the top level individual files.
cmd = ("rsync --update " + cfg.win_extras_src + "/{*.dll,*.exe}" cmd = ("rsync --update " + cfg.win_extras_src + "/*.dll " +
cfg.win_extras_src + "/*.exe"
" \"" + cfg.dst + "/\"") " \"" + cfg.dst + "/\"")
_run(cmd) _run(cmd)