seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66242 from akien-mga/scons-unify-tools-target

Browse Source
This commit is contained in:
Rémi Verschelde
2022-09-30 12:28:50 +02:00
committed by GitHub
parent 67961d875d 39facb35a0
commit f47979f087
42 changed files with 215 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/text_server_adv/SCsub
View File

@ -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/"])