From b1860b675c3be3433bc370b4d53480722d529b95 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 22 May 2021 12:25:49 +0200 Subject: Fix build for ubuntu, add ubuntu path for cjk fonts --- src/ResourceLoader.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/ResourceLoader.cpp b/src/ResourceLoader.cpp index 85b3619..f7ce555 100644 --- a/src/ResourceLoader.cpp +++ b/src/ResourceLoader.cpp @@ -42,16 +42,10 @@ namespace QuickMedia::FontLoader { } case FontType::CJK: { noto_directories.push_back("/usr/share/fonts/noto-cjk"); - noto_directories.push_back("/usr/share/fonts/truetype/noto-cjk"); + noto_directories.push_back("/usr/share/fonts/opentype/noto"); font_file_name = "NotoSansCJK-Regular.ttc"; break; } - case FontType::EMOJI: { - noto_directories.push_back("/usr/share/fonts/noto"); - noto_directories.push_back("/usr/share/fonts/truetype/noto"); - font_file_name = "NotoColorEmoji.ttf"; - break; - } } for(const std::string ¬o_dir : noto_directories) { @@ -59,6 +53,7 @@ namespace QuickMedia::FontLoader { break; } + fprintf(stderr, "Warning: Failed to load font: %s\n", font_file_name.c_str()); font = new_font.get(); font_cache[(size_t)font_type] = std::move(new_font); malloc_trim(0); -- cgit v1.2.3