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

Merge pull request #95417 from bruvzg/win_dll_exports 

Remove unnecessary DLL export attributes.
This commit is contained in:
Rémi Verschelde 2024-08-16 14:34:08 +02:00
parent cc894e59ea 3156856aa1
commit 751d285f3f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/text_server_adv/SCsub
View File

@ -142,7 +142,14 @@ if env["builtin_harfbuzz"]:
env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"]) env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"])
if env["builtin_icu4c"]: if env["builtin_icu4c"]:
env_harfbuzz.Prepend(CPPPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"]) env_harfbuzz.Prepend(CPPPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
env_harfbuzz.Append(CCFLAGS=["-DU_HAVE_LIB_SUFFIX=1", "-DU_LIB_SUFFIX_C_NAME=_godot", "-DHAVE_ICU_BUILTIN"]) env_harfbuzz.Append(
CCFLAGS=[
"-DU_STATIC_IMPLEMENTATION",
"-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(
@ -499,6 +506,7 @@ if env["builtin_icu4c"]:
) )
env_text_server_adv.Append( env_text_server_adv.Append(
CXXFLAGS=[ CXXFLAGS=[
"-DU_STATIC_IMPLEMENTATION",
"-DU_HAVE_LIB_SUFFIX=1", "-DU_HAVE_LIB_SUFFIX=1",
"-DU_LIB_SUFFIX_C_NAME=_godot", "-DU_LIB_SUFFIX_C_NAME=_godot",
"-DICU_DATA_NAME=" + icu_data_name, "-DICU_DATA_NAME=" + icu_data_name,

2
modules/text_server_adv/gdextension_build/SConstruct
View File

@ -415,6 +415,7 @@ if env["platform"] == "android" or env["platform"] == "linuxbsd":
env_harfbuzz.Append( env_harfbuzz.Append(
CCFLAGS=[ CCFLAGS=[
"-DU_STATIC_IMPLEMENTATION",
"-DU_HAVE_LIB_SUFFIX=1", "-DU_HAVE_LIB_SUFFIX=1",
"-DU_LIB_SUFFIX_C_NAME=_godot", "-DU_LIB_SUFFIX_C_NAME=_godot",
"-DHAVE_ICU_BUILTIN", "-DHAVE_ICU_BUILTIN",
@ -746,6 +747,7 @@ env_icu.Append(
) )
env.Append( env.Append(
CXXFLAGS=[ CXXFLAGS=[
"-DU_STATIC_IMPLEMENTATION",
"-DU_HAVE_LIB_SUFFIX=1", "-DU_HAVE_LIB_SUFFIX=1",
"-DU_LIB_SUFFIX_C_NAME=_godot", "-DU_LIB_SUFFIX_C_NAME=_godot",
"-DICU_DATA_NAME=" + icu_data_name, "-DICU_DATA_NAME=" + icu_data_name,