m92-d9b8efde6d set skia_use_system_freetype2=true for Linux because o…

…f fontconfig linked dynamically JetBrains/skija#113
HumbleUI · Aug 9, 2021 · c454aba · c454aba
1 parent 04cf144
commit c454aba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ on:
         default: 'false'
 
 env:
-  version: m92-f46c37ba85-2
+  version: m92-d9b8efde6d
 
 jobs:
   macos:

diff --git a/script/build.py b/script/build.py
@@ -24,7 +24,6 @@ def main():
     'skia_use_system_zlib=false',
     'skia_use_sfntly=false',
     'skia_use_freetype=true',
-    'skia_use_system_freetype2=false',
     # 'skia_use_harfbuzz=true',
     'skia_use_system_harfbuzz=false',
     'skia_pdf_subset_harfbuzz=true',
@@ -37,6 +36,7 @@ def main():
 
   if 'macos' == system:
     args += [
+      'skia_use_system_freetype2=false',
       # 'skia_enable_gpu=true',
       # 'skia_use_gl=true',
       'skia_use_metal=true',
@@ -48,19 +48,22 @@ def main():
       args += ['extra_cflags=["-stdlib=libc++", "-mmacosx-version-min=10.13"]']
   elif 'linux' == system:
     args += [
+      'skia_use_system_freetype2=true',
       # 'skia_enable_gpu=true',
       # 'skia_use_gl=true',
       'extra_cflags_cc=["-frtti"]',
       'cxx="g++-9"',
     ]
   elif 'windows' == system:
     args += [
+      'skia_use_system_freetype2=false',
       # 'skia_use_angle=true',
       'skia_use_direct3d=true',
       'extra_cflags=["-DSK_FONT_HOST_USE_SYSTEM_SETTINGS"]',
     ]
   elif 'android' == system:
     args += [
+      'skia_use_system_freetype2=false',
       'ndk="'+ ndk + '"'
     ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ on: @@
             default: 'false'
     env:
-      version: m92-f46c37ba85-2
+      version: m92-d9b8efde6d
     jobs:
       macos:
@@ Expand Down @@