Skip to content

Commit 41556ea

Browse files
committed
add freetype fix
1 parent c5a9081 commit 41556ea

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

android/run-web.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ EOF
6464
--cross-file "./android/crossbuilt-web.ini" \
6565
-Dcpp_args=-DAUDIO_PREFER_MP3 \
6666
-Ddefault_library=static \
67-
-Dfreetype2:zlib=disabled
67+
-Dfreetype2:zlib=external
6868

6969
meson compile -C "$BUILD_DIR"
7070

subprojects/freetype2.wrap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ source_filename = freetype-2.12.1.tar.xz
55
source_hash = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
66
wrapdb_version = 2.12.1-2
77

8+
diff_files = freetype-2.12.1_web.diff
9+
810
[provide]
911
freetype2 = freetype_dep
1012
freetype = freetype_dep
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/meson.build b/meson.build
2+
index a066325..eaa53fb 100644
3+
--- a/meson.build
4+
+++ b/meson.build
5+
@@ -255,6 +255,9 @@ if host_machine.system() == 'darwin'
6+
'-compatibility_version', ft2_pkgconfig_version.split('.')[0],
7+
'-current_version', ft2_pkgconfig_version
8+
]
9+
+elif host_machine.system() == 'emscripten'
10+
+ thread_dep = dependency('threads')
11+
+ ft2_deps += thread_dep
12+
endif
13+
14+

0 commit comments

Comments
 (0)