Przeglądaj źródła

Merge pull request #67585 from bruvzg/fix_no_graphite_build

[TextServer] Fix build with disabled graphite.
Rémi Verschelde 2 lat temu
rodzic
commit
76ef71bda0
1 zmienionych plików z 6 dodań i 1 usunięć
  1. 6 1
      modules/text_server_adv/SCsub

+ 6 - 1
modules/text_server_adv/SCsub

@@ -131,9 +131,14 @@ if env["builtin_harfbuzz"]:
         env_harfbuzz.Append(
         env_harfbuzz.Append(
             CCFLAGS=[
             CCFLAGS=[
                 "-DHAVE_FREETYPE",
                 "-DHAVE_FREETYPE",
-                "-DHAVE_GRAPHITE2",
             ]
             ]
         )
         )
+        if env["graphite"]:
+            env_harfbuzz.Append(
+                CCFLAGS=[
+                    "-DHAVE_GRAPHITE2",
+                ]
+            )
         if env["builtin_freetype"]:
         if env["builtin_freetype"]:
             env_harfbuzz.Prepend(CPPPATH=["#thirdparty/freetype/include"])
             env_harfbuzz.Prepend(CPPPATH=["#thirdparty/freetype/include"])
         if env["builtin_graphite"] and env["graphite"]:
         if env["builtin_graphite"] and env["graphite"]: