Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #971 from Faless/build/4.x_default_gnu 

[SCons] Platform agnostic default toolchain (GNU).
pull/974/head
Rémi Verschelde 2022-12-20 18:02:49 +01:00 committed by GitHub
parent 104997e83e 8d6982be3b
commit 99de0a872e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -28,7 +28,9 @@ elif ARGUMENTS.get("platform", ""):
else: else:
raise ValueError("Could not detect platform automatically, please specify with platform=<platform>") raise ValueError("Could not detect platform automatically, please specify with platform=<platform>")
env = Environment(tools=["default"]) # Default tools with no platform defaults to gnu toolchain.
# We apply platform specific toolchains via our custom tools.
env = Environment(tools=["default"], PLATFORM="")
# Default num_jobs to local cpu count if not user specified. # Default num_jobs to local cpu count if not user specified.
# SCons has a peculiarity where user-specified options won't be overridden # SCons has a peculiarity where user-specified options won't be overridden

5
tools/windows.py
View File

@ -23,7 +23,12 @@ def generate(env):
elif env["arch"] == "x86_32": elif env["arch"] == "x86_32":
env["TARGET_ARCH"] = "x86" env["TARGET_ARCH"] = "x86"
env["is_msvc"] = True env["is_msvc"] = True
# MSVC, linker, and archiver.
msvc.generate(env) msvc.generate(env)
env.Tool("mslib")
env.Tool("mslink")
env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"]) env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"])
env.Append(CCFLAGS=["/EHsc"]) env.Append(CCFLAGS=["/EHsc"])
env.Append(LINKFLAGS=["/WX"]) env.Append(LINKFLAGS=["/WX"])