Skip to content

Commit

Permalink
fix is_msvc and use_hot_reload variables
Browse files Browse the repository at this point in the history
(cherry picked from commit 648b8c4)
  • Loading branch information
Repiteo authored and dsnopek committed Nov 13, 2023
1 parent 805cdde commit a1ae584
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions tools/godotcpp.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,15 @@ def generate(env):

print("Building for architecture " + env["arch"] + " on platform " + env["platform"])

tool = Tool(env["platform"], toolpath=["tools"])

if tool is None or not tool.exists(env):
raise ValueError("Required toolchain not found for platform " + env["platform"])

tool.generate(env)
target_tool = Tool("targets", toolpath=["tools"])
target_tool.generate(env)

# Disable exception handling. Godot doesn't use exceptions anywhere, and this
# saves around 20% of binary size and very significant build time.
if env["disable_exceptions"]:
Expand All @@ -249,15 +258,6 @@ def generate(env):
elif env.get("is_msvc", False):
env.Append(CXXFLAGS=["/EHsc"])

tool = Tool(env["platform"], toolpath=["tools"])

if tool is None or not tool.exists(env):
raise ValueError("Required toolchain not found for platform " + env["platform"])

tool.generate(env)
target_tool = Tool("targets", toolpath=["tools"])
target_tool.generate(env)

# Require C++17
if env.get("is_msvc", False):
env.Append(CXXFLAGS=["/std:c++17"])
Expand Down

0 comments on commit a1ae584

Please sign in to comment.