Parcourir la source

Merge pull request #95417 from bruvzg/win_dll_exports

Remove unnecessary DLL export attributes.
Rémi Verschelde il y a 1 an
Parent
commit
751d285f3f

+ 9 - 1
modules/text_server_adv/SCsub

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

+ 2 - 0
modules/text_server_adv/gdextension_build/SConstruct

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