mirror of
https://github.com/RPCS3/rpcs3.git
synced 2026-06-06 15:15:00 -06:00
Merge branch 'RPCS3:master' into feat/clans
This commit is contained in:
commit
259d6c6376
@ -120,9 +120,15 @@ namespace rsx
|
|||||||
{
|
{
|
||||||
result.font_names.emplace_back("Arial.ttf");
|
result.font_names.emplace_back("Arial.ttf");
|
||||||
result.font_names.emplace_back("arial.ttf");
|
result.font_names.emplace_back("arial.ttf");
|
||||||
#ifndef _WIN32
|
#ifdef __APPLE__
|
||||||
result.font_names.emplace_back("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"); // ubuntu
|
result.font_names.emplace_back("DejaVuSans.ttf");
|
||||||
result.font_names.emplace_back("/usr/share/fonts/TTF/DejaVuSans.ttf"); // arch
|
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
|
#endif
|
||||||
// Attempt to load a font from dev_flash as a last resort
|
// Attempt to load a font from dev_flash as a last resort
|
||||||
result.font_names.emplace_back("SCE-PS3-VR-R-LATIN.TTF");
|
result.font_names.emplace_back("SCE-PS3-VR-R-LATIN.TTF");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user