diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2024-01-26 13:18:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-26 13:18:26 +0100 |
commit | 17e7f85c06366b427e5068c5b3e2940e27ff5f1d (patch) | |
tree | 1ca7ef65a4676c23c057260d25226cdf3835d2f0 /misc/scripts/install_d3d12_sdk_windows.py | |
parent | 99ac3d332ac8aec3ef93b13e8aa9755da667efb0 (diff) | |
parent | b4e519b07f37c8a3e8d2282df085e059cbf87d4b (diff) | |
download | redot-engine-17e7f85c06366b427e5068c5b3e2940e27ff5f1d.tar.gz |
Merge pull request #87609 from akien-mga/scons-d3d12-install-fix-linux-support
SCons: Fix Windows cross-compilation from Linux after #86717
Diffstat (limited to 'misc/scripts/install_d3d12_sdk_windows.py')
-rw-r--r-- | misc/scripts/install_d3d12_sdk_windows.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/misc/scripts/install_d3d12_sdk_windows.py b/misc/scripts/install_d3d12_sdk_windows.py index 0995aa734f..8cfa1d399b 100644 --- a/misc/scripts/install_d3d12_sdk_windows.py +++ b/misc/scripts/install_d3d12_sdk_windows.py @@ -5,7 +5,13 @@ import urllib.request import shutil # Base Godot dependencies path -deps_folder = os.path.join(f"{os.getenv('LOCALAPPDATA')}", "Godot", "build_deps") +# If cross-compiling (no LOCALAPPDATA), we install in `bin` +deps_folder = os.getenv("LOCALAPPDATA") +if deps_folder: + deps_folder = os.path.join(deps_folder, "Godot", "build_deps") +else: + deps_folder = os.path.join("bin", "build_deps") + # DirectX Shader Compiler dxc_version = "v1.7.2308" dxc_filename = "dxc_2023_08_14.zip" |