Merge branch 'RPCS3:master' into feat/clans

This commit is contained in:
zeph 2025-12-09 18:29:20 +01:00 committed by GitHub
commit 259d6c6376
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -120,9 +120,15 @@ namespace rsx
{
result.font_names.emplace_back("Arial.ttf");
result.font_names.emplace_back("arial.ttf");
#ifndef _WIN32
result.font_names.emplace_back("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"); // ubuntu
result.font_names.emplace_back("/usr/share/fonts/TTF/DejaVuSans.ttf"); // arch
#ifdef __APPLE__
result.font_names.emplace_back("DejaVuSans.ttf");
result.font_names.emplace_back("NotoSans-Regular.ttf");
result.font_names.emplace_back("Roboto-Regular.ttf");
result.font_names.emplace_back("OpenSans-Regular.ttf");
result.font_names.emplace_back("FreeSans.ttf");
#elifndef _WIN32
result.font_names.emplace_back("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"); // ubuntu
result.font_names.emplace_back("/usr/share/fonts/TTF/DejaVuSans.ttf"); // arch
#endif
// Attempt to load a font from dev_flash as a last resort
result.font_names.emplace_back("SCE-PS3-VR-R-LATIN.TTF");