Merge branch 'legendary-gl:master' into hidden-console

This commit is contained in:
zzahkaboom24 2026-08-20 23:00:07 +02:00 committed by GitHub
commit 897e38a14c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions

View file

@ -80,7 +80,7 @@ jobs:
- run: mkdir -p build dist
- name: Dependencies
run: uv export --format requirements.txt --no-editable | uv pip install --requirement - --target build
run: uv export --format requirements.txt --no-editable --no-dev | uv pip install --requirement - --target build
- run: cp zipapp_main.py build/__main__.py

View file

@ -687,15 +687,18 @@ class LegendaryCLI:
if args.json:
return self._print_json(vars(params), args.pretty_json)
# Copying existing env vars is required on Windows, probably a good idea on Linux
full_env = os.environ.copy()
full_env.update(params.environment)
full_params = list()
full_params.extend(params.launch_command)
if 'LEGENDARY_WRAPPER_EXE' in full_env:
full_params.append(full_env['LEGENDARY_WRAPPER_EXE'].strip())
full_params.append(os.path.join(params.game_directory, params.game_executable))
full_params.extend(params.game_parameters)
full_params.extend(params.user_parameters)
full_params.extend(params.egl_parameters)
# Copying existing env vars is required on Windows, probably a good idea on Linux
full_env = os.environ.copy()
full_env.update(params.environment)
if 'CX_BOTTLE' in full_env and any('SharedSupport/CrossOver' in p for p in params.launch_command):
# if using crossover, unset WINEPREFIX