diff options
author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-12-05 07:56:44 +0200 |
---|---|---|
committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-12-05 07:56:44 +0200 |
commit | 89db7f8e7c6971f5a20e493bab338bbaee9d0457 (patch) | |
tree | d113872f3cff2f9dbd62dd5eb31c3ed17ef75762 | |
parent | 8912f3e4a7c012443e941f4c6f2342c9913fa330 (diff) |
[Linux/BSD] Fix build without fontconfig.
-rw-r--r-- | platform/linuxbsd/os_linuxbsd.cpp | 2 | ||||
-rw-r--r-- | platform/linuxbsd/os_linuxbsd.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 25cb575199..d5a75edeea 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -616,6 +616,7 @@ Vector<String> OS_LinuxBSD::get_system_fonts() const { #endif } +#ifdef FONTCONFIG_ENABLED int OS_LinuxBSD::_weight_to_fc(int p_weight) const { if (p_weight < 150) { return FC_WEIGHT_THIN; @@ -665,6 +666,7 @@ int OS_LinuxBSD::_stretch_to_fc(int p_stretch) const { return FC_WIDTH_ULTRAEXPANDED; } } +#endif // FONTCONFIG_ENABLED Vector<String> OS_LinuxBSD::get_system_font_path_for_text(const String &p_font_name, const String &p_text, const String &p_locale, const String &p_script, int p_weight, int p_stretch, bool p_italic) const { #ifdef FONTCONFIG_ENABLED diff --git a/platform/linuxbsd/os_linuxbsd.h b/platform/linuxbsd/os_linuxbsd.h index ef830a069b..bf469af568 100644 --- a/platform/linuxbsd/os_linuxbsd.h +++ b/platform/linuxbsd/os_linuxbsd.h @@ -51,6 +51,9 @@ class OS_LinuxBSD : public OS_Unix { bool font_config_initialized = false; FcConfig *config = nullptr; FcObjectSet *object_set = nullptr; + + int _weight_to_fc(int p_weight) const; + int _stretch_to_fc(int p_stretch) const; #endif #ifdef JOYDEV_ENABLED @@ -73,9 +76,6 @@ class OS_LinuxBSD : public OS_Unix { MainLoop *main_loop = nullptr; - int _weight_to_fc(int p_weight) const; - int _stretch_to_fc(int p_stretch) const; - String get_systemd_os_release_info_value(const String &key) const; Vector<String> lspci_device_filter(Vector<String> vendor_device_id_mapping, String class_suffix, String check_column, String whitelist) const; |