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/text_server_adv | |
| parent | 67961d875d518b565bc1fa923772af56fb227063 (diff) | |
| parent | 39facb35a021f9301f742732fbbd3c6a5a548893 (diff) | |
Merge pull request #66242 from akien-mga/scons-unify-tools-target
Diffstat (limited to 'modules/text_server_adv')
| -rw-r--r-- | modules/text_server_adv/SCsub | 4 | ||||
| -rw-r--r-- | modules/text_server_adv/gdextension_build/SConstruct | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub index 847d8b7ee3..2261342467 100644 --- a/modules/text_server_adv/SCsub +++ b/modules/text_server_adv/SCsub @@ -448,7 +448,7 @@ if env["builtin_icu"]: icu_data_name = "icudt71l.dat" - if env_icu["tools"]: + if env.editor_build: env_icu.Depends("#thirdparty/icu4c/icudata.gen.h", "#thirdparty/icu4c/" + icu_data_name) env_icu.Command("#thirdparty/icu4c/icudata.gen.h", "#thirdparty/icu4c/" + icu_data_name, make_icu_data) env_text_server_adv.Prepend(CPPPATH=["#thirdparty/icu4c/"]) @@ -482,7 +482,7 @@ if env["builtin_icu"]: "-DICU_DATA_NAME=" + icu_data_name, ] ) - if env_text_server_adv["tools"]: + if env.editor_build: env_text_server_adv.Append(CXXFLAGS=["-DICU_STATIC_DATA"]) env_text_server_adv.Prepend(CPPPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"]) diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct index 488d1f641b..7ca8859ee6 100644 --- a/modules/text_server_adv/gdextension_build/SConstruct +++ b/modules/text_server_adv/gdextension_build/SConstruct @@ -193,7 +193,7 @@ if env["freetype_enabled"]: "FT_CONFIG_OPTION_SYSTEM_ZLIB", ] ) - if env["target"] == "debug": + if env.dev_build: env_freetype.Append(CPPDEFINES=["ZLIB_DEBUG"]) env.Append(CPPDEFINES=["MODULE_FREETYPE_ENABLED"]) |