|
@@ -122,7 +122,7 @@ if env["builtin_harfbuzz"]:
|
|
env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"])
|
|
env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"])
|
|
if env["builtin_icu"]:
|
|
if env["builtin_icu"]:
|
|
env_harfbuzz.Append(CPPPATH=["#thirdparty/icu4c/common/"])
|
|
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:
|
|
if freetype_enabled:
|
|
env_harfbuzz.Append(
|
|
env_harfbuzz.Append(
|
|
@@ -464,11 +464,16 @@ if env["builtin_icu"]:
|
|
"-DUCONFIG_NO_FILE_IO",
|
|
"-DUCONFIG_NO_FILE_IO",
|
|
"-DUCONFIG_NO_TRANSLITERATION",
|
|
"-DUCONFIG_NO_TRANSLITERATION",
|
|
"-DPKGDATA_MODE=static",
|
|
"-DPKGDATA_MODE=static",
|
|
|
|
+ "-DU_ENABLE_DYLOAD=0",
|
|
|
|
+ "-DU_HAVE_LIB_SUFFIX=1",
|
|
|
|
+ "-DU_LIB_SUFFIX_C_NAME=_godot",
|
|
"-DICU_DATA_NAME=" + icu_data_name,
|
|
"-DICU_DATA_NAME=" + icu_data_name,
|
|
]
|
|
]
|
|
)
|
|
)
|
|
env_text_server_adv.Append(
|
|
env_text_server_adv.Append(
|
|
CXXFLAGS=[
|
|
CXXFLAGS=[
|
|
|
|
+ "-DU_HAVE_LIB_SUFFIX=1",
|
|
|
|
+ "-DU_LIB_SUFFIX_C_NAME=_godot",
|
|
"-DICU_DATA_NAME=" + icu_data_name,
|
|
"-DICU_DATA_NAME=" + icu_data_name,
|
|
]
|
|
]
|
|
)
|
|
)
|