diff options
author | dec05eba <dec05eba@protonmail.com> | 2021-05-22 12:25:49 +0200 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2021-05-22 12:25:49 +0200 |
commit | b1860b675c3be3433bc370b4d53480722d529b95 (patch) | |
tree | d09228282067014bb318216a6ec6143843dd9eb6 /src | |
parent | ebd068ccc32787ac9fc2a2cde9a2e7c1cccb9b07 (diff) |
Fix build for ubuntu, add ubuntu path for cjk fonts
Diffstat (limited to 'src')
-rw-r--r-- | src/ResourceLoader.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
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); |