mirror of
https://github.com/godotengine/godot
synced 2024-09-16 01:59:35 +00:00
Merge pull request #63762 from bruvzg/ft_warn
[TextServer] Add a build warning when building with external FreeType without Brotli support.
This commit is contained in:
commit
ae335196b5
|
@ -515,6 +515,7 @@ if env["builtin_msdfgen"] and msdfgen_enabled:
|
|||
env_text_server_adv.Prepend(CPPPATH=["#thirdparty/msdfgen"])
|
||||
|
||||
if env["builtin_freetype"] and freetype_enabled:
|
||||
env_text_server_adv.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
|
||||
env_text_server_adv.Prepend(CPPPATH=["#thirdparty/freetype/include"])
|
||||
|
||||
if env["builtin_graphite"] and freetype_enabled and env["graphite"]:
|
||||
|
|
|
@ -113,7 +113,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
|
||||
#include <hb-ft.h>
|
||||
#include <hb-ot.h>
|
||||
#endif
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
Loading…
Reference in a new issue