diff options
| author | Larry Tran <lawrence.c.tran@outlook.com> | 2022-08-05 18:47:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-05 18:47:20 -0500 |
| commit | 2ea4baae0a0dbf76b9b2fe71bdcb72601ddab868 (patch) | |
| tree | 622c070fce3229f151f941d74324b31f5f5ac3fd /modules/text_server_fb | |
| parent | e029e664548dcada4d07a7e2f85cad18bb2feebe (diff) | |
| parent | c80540f9a20b45d107b9bed1e749571a83492337 (diff) | |
Merge branch 'master' into bugfix-ios-export
Diffstat (limited to 'modules/text_server_fb')
| -rw-r--r-- | modules/text_server_fb/SCsub | 1 | ||||
| -rw-r--r-- | modules/text_server_fb/text_server_fb.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/modules/text_server_fb/SCsub b/modules/text_server_fb/SCsub index ca9322e450..8f626f02b8 100644 --- a/modules/text_server_fb/SCsub +++ b/modules/text_server_fb/SCsub @@ -12,6 +12,7 @@ if env["builtin_msdfgen"] and msdfgen_enabled: env_text_server_fb.Prepend(CPPPATH=["#thirdparty/msdfgen"]) if env["builtin_freetype"] and freetype_enabled: + env_text_server_fb.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"]) env_text_server_fb.Prepend(CPPPATH=["#thirdparty/freetype/include"]) env_text_server_fb.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/text_server_fb/text_server_fb.h b/modules/text_server_fb/text_server_fb.h index adb5cbb817..fef19d442b 100644 --- a/modules/text_server_fb/text_server_fb.h +++ b/modules/text_server_fb/text_server_fb.h @@ -98,6 +98,10 @@ using namespace godot; #include FT_ADVANCES_H #include FT_MULTIPLE_MASTERS_H #include FT_BBOX_H +#include FT_CONFIG_OPTIONS_H +#if !defined(FT_CONFIG_OPTION_USE_BROTLI) && !defined(_MSC_VER) +#warning FreeType is configured without Brotli support, built-in fonts will not be available. +#endif #endif /*************************************************************************/ |