Skip to content

Commit

Permalink
Merge pull request godotengine#87609 from akien-mga/scons-d3d12-insta…
Browse files Browse the repository at this point in the history
…ll-fix-linux-support

SCons: Fix Windows cross-compilation from Linux after godotengine#86717
  • Loading branch information
akien-mga authored Jan 26, 2024
2 parents 99ac3d3 + b4e519b commit 17e7f85
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
8 changes: 7 additions & 1 deletion misc/scripts/install_d3d12_sdk_windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
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"
Expand Down
17 changes: 15 additions & 2 deletions platform/windows/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,21 @@ def get_opts():

mingw = os.getenv("MINGW_PREFIX", "")

# Direct3D 12 SDK dependencies folder
d3d12_deps_folder = os.path.join(os.getenv("LOCALAPPDATA"), "Godot", "build_deps")
# Direct3D 12 SDK dependencies folder.
d3d12_deps_folder = os.getenv("LOCALAPPDATA")
if d3d12_deps_folder:
d3d12_deps_folder = os.path.join(d3d12_deps_folder, "Godot", "build_deps")
else:
# Cross-compiling, the deps install script puts things in `bin`.
# Getting an absolute path to it is a bit hacky in Python.
try:
import inspect

caller_frame = inspect.stack()[1]
caller_script_dir = os.path.dirname(os.path.abspath(caller_frame[1]))
d3d12_deps_folder = os.path.join(caller_script_dir, "bin", "build_deps")
except: # Give up.
d3d12_deps_folder = ""

return [
("mingw_prefix", "MinGW prefix", mingw),
Expand Down

0 comments on commit 17e7f85

Please sign in to comment.