diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-09-30 12:28:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 12:28:50 +0200 |
| commit | f47979f0874b2ca6134e71575fbb359c6cc5ced0 (patch) | |
| tree | c5c2159d3317f1da839e390281d6f32eb82e1158 /modules/mono | |
| parent | 67961d875d518b565bc1fa923772af56fb227063 (diff) | |
| parent | 39facb35a021f9301f742732fbbd3c6a5a548893 (diff) | |
Merge pull request #66242 from akien-mga/scons-unify-tools-target
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/SCsub | 2 | ||||
| -rw-r--r-- | modules/mono/build_scripts/mono_configure.py | 9 | ||||
| -rw-r--r-- | modules/mono/config.py | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/modules/mono/SCsub b/modules/mono/SCsub index 7764ba0b45..a4667f784d 100644 --- a/modules/mono/SCsub +++ b/modules/mono/SCsub @@ -26,6 +26,6 @@ if env["platform"] in ["macos", "ios"]: elif env["platform"] == "android": env_mono.add_source_files(env.modules_sources, "mono_gd/android_mono_config.gen.cpp") -if env["tools"]: +if env.editor_build: env_mono.add_source_files(env.modules_sources, "editor/*.cpp") SConscript("editor/script_templates/SCsub") diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index 5d63773096..5cec8f41f5 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -20,10 +20,7 @@ def configure(env, env_mono): # is_ios = env["platform"] == "ios" # is_ios_sim = is_ios and env["arch"] in ["x86_32", "x86_64"] - tools_enabled = env["tools"] - - if tools_enabled and not module_supports_tools_on(env["platform"]): - raise RuntimeError("This module does not currently support building for this platform with tools enabled") - - if env["tools"]: + if env.editor_build: + if not module_supports_tools_on(env["platform"]): + raise RuntimeError("This module does not currently support building for this platform for editor builds.") env_mono.Append(CPPDEFINES=["GD_MONO_HOT_RELOAD"]) diff --git a/modules/mono/config.py b/modules/mono/config.py index 15fe79ef8c..a36083b64b 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -7,7 +7,7 @@ def can_build(env, platform): if env["arch"].startswith("rv"): return False - if env["tools"]: + if env.editor_build: env.module_add_dependencies("mono", ["regex"]) return True |