aboutsummaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-12-07 10:05:18 +0100
committer GitHub <noreply@github.com>2023-12-07 10:05:18 +0100
commita6952efba078e49d6555b0586230986a2cb7ed40 (patch)
treedc9a4d1a107902f0b4de21eeb503c4d901379ce0 /SConstruct
parente01d332f407420db84fbfd207f18c3fec1c1b6a3 (diff)
parent291022316a4a3c742be92abd0d2b94256df60143 (diff)
Merge pull request #167 from Spartan322/update/godot4.2-stable
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct10
1 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct
index f6ed7f6..bcb477a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -12,19 +12,15 @@ 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 = 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
+SCons.Script.ARGUMENTS["compiledb_file"] = 'godot-cpp/compile_commands.json'
godot_env = SConscript("godot-cpp/SConstruct")
SCons.Script.ARGUMENTS = OLD_ARGS
@@ -91,4 +87,8 @@ if "env" in locals():
# FIXME: This method mixes both cosmetic progress stuff and cache handling...
env.show_progress(env)
+# Add compiledb if the option is set
+if env.get("compiledb", False):
+ default_args += ["compiledb"]
+
Default(*default_args)