diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-26 23:28:55 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-26 23:28:55 +0200 |
| commit | 7ce65f54bef63e5084476e210f72f32acb80952a (patch) | |
| tree | 1ef47a00dd44a4149aad964fb873f5e146b8a785 /SConstruct | |
| parent | c5eacb8698471473f2b1ebcb9fe031a6b2ce9c33 (diff) | |
| parent | a387c26770dc3bec627176d165fc7f31cd5eb768 (diff) | |
| download | redot-engine-7ce65f54bef63e5084476e210f72f32acb80952a.tar.gz | |
Merge pull request #95504 from mihe/ninja-options
Expose more Ninja-related build options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 94574aacb2..d2cfe2732c 100644 --- a/SConstruct +++ b/SConstruct @@ -234,6 +234,8 @@ opts.Add(BoolVariable("dev_mode", "Alias for dev options: verbose=yes warnings=e opts.Add(BoolVariable("tests", "Build the unit tests", False)) opts.Add(BoolVariable("fast_unsafe", "Enable unsafe options for faster rebuilds", False)) opts.Add(BoolVariable("ninja", "Use the ninja backend for faster rebuilds", False)) +opts.Add(BoolVariable("ninja_auto_run", "Run ninja automatically after generating the ninja file", True)) +opts.Add("ninja_file", "Path to the generated ninja file", "build.ninja") opts.Add(BoolVariable("compiledb", "Generate compilation DB (`compile_commands.json`) for external tools", False)) opts.Add(BoolVariable("verbose", "Enable verbose output for the compilation", False)) opts.Add(BoolVariable("progress", "Show a progress indicator during compilation", True)) @@ -1031,13 +1033,10 @@ if env["ninja"]: Exit(255) SetOption("experimental", "ninja") + env["NINJA_FILE_NAME"] = env["ninja_file"] + env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"] env.Tool("ninja") - # By setting this we allow the user to run ninja by themselves with all - # the flags they need, as apparently automatically running from scons - # is way slower. - SetOption("disable_execute_ninja", True) - # Threads if env["threads"]: env.Append(CPPDEFINES=["THREADS_ENABLED"]) |