From 89db7f8e7c6971f5a20e493bab338bbaee9d0457 Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Mon, 5 Dec 2022 07:56:44 +0200 Subject: [PATCH] [Linux/BSD] Fix build without fontconfig. --- platform/linuxbsd/os_linuxbsd.cpp | 2 ++ 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 25cb5751996..d5a75edeea6 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -616,6 +616,7 @@ Vector 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 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 ef830a069bc..bf469af568a 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 lspci_device_filter(Vector vendor_device_id_mapping, String class_suffix, String check_column, String whitelist) const;