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

Merge pull request #108613 from Repiteo/scons/fix-defines

Browse Source 
SCons: Ensure `CPPDEFINES` is properly utilized
This commit is contained in:
Thaddeus Crews
2025-09-16 11:44:45 -05:00
parent 697474baad 61956f2e06
commit 4dec6af2c8
9 changed files with 80 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
modules/text_server_adv/SCsub
View File

@ -122,38 +122,30 @@ if env["builtin_harfbuzz"]:
env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/harfbuzz/src"])
env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"])
env_harfbuzz.Append(CPPDEFINES=["HAVE_ICU"])
if env["builtin_icu4c"]:
env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
env_harfbuzz.Append(
CCFLAGS=[
"-DU_STATIC_IMPLEMENTATION",
"-DU_HAVE_LIB_SUFFIX=1",
"-DU_LIB_SUFFIX_C_NAME=_godot",
"-DHAVE_ICU_BUILTIN",
CPPDEFINES=[
"U_STATIC_IMPLEMENTATION",
("U_HAVE_LIB_SUFFIX", 1),
("U_LIB_SUFFIX_C_NAME", "_godot"),
"HAVE_ICU_BUILTIN",
]
)
if freetype_enabled:
env_harfbuzz.Append(
CCFLAGS=[
"-DHAVE_FREETYPE",
]
)
env_harfbuzz.Append(CPPDEFINES=["HAVE_FREETYPE"])
if env["graphite"]:
env_harfbuzz.Append(
CCFLAGS=[
"-DHAVE_GRAPHITE2",
]
)
env_harfbuzz.Append(CPPDEFINES=["HAVE_GRAPHITE2"])
if env["builtin_freetype"]:
env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/freetype/include"])
if env["builtin_graphite"] and env["graphite"]:
env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/graphite/include"])
env_harfbuzz.Append(CCFLAGS=["-DGRAPHITE2_STATIC"])
env_harfbuzz.Append(CPPDEFINES=["GRAPHITE2_STATIC"])
if env["platform"] in ["android", "linuxbsd", "web"]:
env_harfbuzz.Append(CCFLAGS=["-DHAVE_PTHREAD"])
env_harfbuzz.Append(CPPDEFINES=["HAVE_PTHREAD"])
env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/harfbuzz/src"])
@ -220,10 +212,10 @@ if env["builtin_graphite"] and freetype_enabled and env["graphite"]:
env_graphite.Prepend(CPPEXTPATH=["#thirdparty/graphite/src", "#thirdparty/graphite/include"])
env_graphite.Append(
CCFLAGS=[
"-DGRAPHITE2_STATIC",
"-DGRAPHITE2_NTRACING",
"-DGRAPHITE2_NFILEFACE",
CPPDEFINES=[
"GRAPHITE2_STATIC",
"GRAPHITE2_NTRACING",
"GRAPHITE2_NFILEFACE",
]
)
@ -463,32 +455,32 @@ if env["builtin_icu4c"]:
env_icu.Prepend(CPPEXTPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
env_icu.Append(
CXXFLAGS=[
"-DU_STATIC_IMPLEMENTATION",
"-DU_COMMON_IMPLEMENTATION",
"-DUCONFIG_NO_COLLATION",
"-DUCONFIG_NO_CONVERSION",
"-DUCONFIG_NO_FORMATTING",
"-DUCONFIG_NO_SERVICE",
"-DUCONFIG_NO_IDNA",
"-DUCONFIG_NO_FILE_IO",
"-DUCONFIG_NO_TRANSLITERATION",
"-DUCONFIG_NO_REGULAR_EXPRESSIONS",
"-DPKGDATA_MODE=static",
"-DU_ENABLE_DYLOAD=0",
"-DU_HAVE_LIB_SUFFIX=1",
"-DU_LIB_SUFFIX_C_NAME=_godot",
CPPDEFINES=[
"U_STATIC_IMPLEMENTATION",
"U_COMMON_IMPLEMENTATION",
"UCONFIG_NO_COLLATION",
"UCONFIG_NO_CONVERSION",
"UCONFIG_NO_FORMATTING",
"UCONFIG_NO_SERVICE",
"UCONFIG_NO_IDNA",
"UCONFIG_NO_FILE_IO",
"UCONFIG_NO_TRANSLITERATION",
"UCONFIG_NO_REGULAR_EXPRESSIONS",
("PKGDATA_MODE", "static"),
("U_ENABLE_DYLOAD", 0),
("U_HAVE_LIB_SUFFIX", 1),
("U_LIB_SUFFIX_C_NAME", "_godot"),
]
)
env_text_server_adv.Append(
CXXFLAGS=[
"-DU_STATIC_IMPLEMENTATION",
"-DU_HAVE_LIB_SUFFIX=1",
"-DU_LIB_SUFFIX_C_NAME=_godot",
CPPDEFINES=[
"U_STATIC_IMPLEMENTATION",
("U_HAVE_LIB_SUFFIX", 1),
("U_LIB_SUFFIX_C_NAME", "_godot"),
]
)
if env.editor_build:
env_text_server_adv.Append(CXXFLAGS=["-DICU_STATIC_DATA"])
env_text_server_adv.Append(CPPDEFINES=["ICU_STATIC_DATA"])
env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])