diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-29 10:26:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 10:26:48 +0200 |
| commit | e3ab577532da2fcb9f1d8fc5acf11c789c09b7b4 (patch) | |
| tree | 6ba62cc223d3fd0e26073b286edb95ec633720f1 | |
| parent | 29a946ee91b7a0ebfee35504436d177630c0924f (diff) | |
| parent | ea4d62dca3e6a088823fc0f40b38179e269592a4 (diff) | |
Merge pull request #59656 from bruvzg/icu_suffix
| -rw-r--r-- | modules/text_server_adv/SCsub | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub index dfd3bb3f1e..525d4d3efb 100644 --- a/modules/text_server_adv/SCsub +++ b/modules/text_server_adv/SCsub @@ -122,7 +122,7 @@ if env["builtin_harfbuzz"]: env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"]) if env["builtin_icu"]: env_harfbuzz.Append(CPPPATH=["#thirdparty/icu4c/common/"]) - env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU_BUILTIN"]) + env_harfbuzz.Append(CCFLAGS=["-DU_HAVE_LIB_SUFFIX=1", "-DU_LIB_SUFFIX_C_NAME=_godot", "-DHAVE_ICU_BUILTIN"]) if freetype_enabled: env_harfbuzz.Append( @@ -464,11 +464,16 @@ if env["builtin_icu"]: "-DUCONFIG_NO_FILE_IO", "-DUCONFIG_NO_TRANSLITERATION", "-DPKGDATA_MODE=static", + "-DU_ENABLE_DYLOAD=0", + "-DU_HAVE_LIB_SUFFIX=1", + "-DU_LIB_SUFFIX_C_NAME=_godot", "-DICU_DATA_NAME=" + icu_data_name, ] ) env_text_server_adv.Append( CXXFLAGS=[ + "-DU_HAVE_LIB_SUFFIX=1", + "-DU_LIB_SUFFIX_C_NAME=_godot", "-DICU_DATA_NAME=" + icu_data_name, ] ) |