diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-27 16:56:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 16:56:59 +0200 |
| commit | 47edfa876908408828cd3b120b32e274d646ab8b (patch) | |
| tree | 243b8fd237f51df291a165c6d727190ceb119aa9 | |
| parent | ba2aa30a1861aed55d1fc80fe48bc356afdf17bd (diff) | |
| parent | f86448520a1c7c3957a3c929c461635cb3bdf5ed (diff) | |
Merge pull request #63538 from bruvzg/fix_linux_build_wo_fontconfig
Fix Linux build without fontconfig.
| -rw-r--r-- | platform/linuxbsd/os_linuxbsd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index bf4634a4fd..7a7a99534a 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -371,7 +371,7 @@ Vector<String> OS_LinuxBSD::get_system_fonts() const { } return ret; #else - ERR_FAIL_COND_V_MSG(Vector<String>(), "Godot was compiled without fontconfig, system font support is disabled.") + ERR_FAIL_V_MSG(Vector<String>(), "Godot was compiled without fontconfig, system font support is disabled."); #endif } @@ -410,10 +410,10 @@ String OS_LinuxBSD::get_system_font_path(const String &p_font_name, bool p_bold, FcPatternDestroy(pattern); } FcObjectSetDestroy(object_set); + return ret; #else - ERR_FAIL_COND_V_MSG(Vector<String>(), "Godot was compiled without fontconfig, system font support is disabled.") + ERR_FAIL_V_MSG(String(), "Godot was compiled without fontconfig, system font support is disabled."); #endif - return ret; } String OS_LinuxBSD::get_config_path() const { |