aboutsummaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
author Spartan322 <Megacake1234@gmail.com>2023-11-11 21:22:46 +0100
committer Spartan322 <Megacake1234@gmail.com>2023-11-12 00:21:01 +0100
commit6b30affe2d374e194fb251a4d8ea165b9ba4a83b (patch)
treebd437704e73b243a57fb07223840c120ac055351 /SConstruct
parentf94b4b195a4a7dcee5fda53db9da8cded846fd7b (diff)
Fix compiledb duplicate warning
Enable use_static_cpp capability
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct19
1 files changed, 10 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct
index 2f0b45a..f6ed7f6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -12,16 +12,21 @@ env = SConscript("scripts/SConstruct")
env.PrependENVPath("PATH", os.getenv("PATH"))
+OLD_ARGS = ARGUMENTS.copy()
+ARGUMENTS["compiledb"] = False
opts = env.SetupOptions()
env.FinalizeOptions()
+ARGUMENTS = OLD_ARGS
# Needs Clone, else godot-cpp builds using our modified environment variables. eg: godot-cpp builds on C++20
-OLD_ARGS = ARGUMENTS.copy()
-ARGUMENTS["use_static_cpp"] = False # TODO: Dependencies need to update scripts submodule
-ARGUMENTS["disable_exceptions"] = env["disable_exceptions"]
+OLD_ARGS = SCons.Script.ARGUMENTS.copy()
+SCons.Script.ARGUMENTS["use_static_cpp"] = env["use_static_cpp"]
+SCons.Script.ARGUMENTS["disable_exceptions"] = env["disable_exceptions"]
+if ARGUMENTS.get("compiledb", False):
+ SCons.Script.ARGUMENTS["compiledb"] = True
godot_env = SConscript("godot-cpp/SConstruct")
-ARGUMENTS = OLD_ARGS
+SCons.Script.ARGUMENTS = OLD_ARGS
# Make LIBS into a list which is easier to deal with.
godot_env["LIBS"] = [godot_env["LIBS"]]
@@ -82,12 +87,8 @@ else:
default_args = [library]
-# Add compiledb if the option is set
-if env.get("compiledb", False):
- default_args += ["compiledb"]
-
if "env" in locals():
# FIXME: This method mixes both cosmetic progress stuff and cache handling...
env.show_progress(env)
-Default(default_args)
+Default(*default_args)