mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: Compile failure if no truetype font support required in build.

This commit is contained in:
Peter Nelson 2024-05-07 23:25:05 +01:00
parent 79cd8cc2c9
commit eb79f691db
No known key found for this signature in database
GPG Key ID: 8EF8F0A467DF75ED
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fontcache.cpp
View File

@ -146,14 +146,14 @@ extern void LoadWin32Font(FontSize fs);
extern void LoadCoreTextFont(FontSize fs); extern void LoadCoreTextFont(FontSize fs);
#endif #endif
#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
/** /**
* Get name of default font file for a given font size. * Get name of default font file for a given font size.
* @param fs Font size. * @param fs Font size.
* @return Name of default font file. * @return Name of default font file.
*/ */
static std::string GetDefaultTruetypeFont([[maybe_unused]] FontSize fs) static std::string GetDefaultTruetypeFont(FontSize fs)
{ {
#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
switch (fs) { switch (fs) {
case FS_NORMAL: return "OpenTTD-Sans.ttf"; case FS_NORMAL: return "OpenTTD-Sans.ttf";
case FS_SMALL: return "OpenTTD-Small.ttf"; case FS_SMALL: return "OpenTTD-Small.ttf";
@ -161,9 +161,8 @@ static std::string GetDefaultTruetypeFont([[maybe_unused]] FontSize fs)
case FS_MONO: return "OpenTTD-Mono.ttf"; case FS_MONO: return "OpenTTD-Mono.ttf";
default: NOT_REACHED(); default: NOT_REACHED();
} }
#endif /* defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) */
return {};
} }
#endif /* defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) */
/** /**
* Get path of default font file for a given font size. * Get path of default font file for a given font size.
@ -175,8 +174,9 @@ static std::string GetDefaultTruetypeFontFile([[maybe_unused]] FontSize fs)
#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) #if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
/* Find font file. */ /* Find font file. */
return FioFindFullPath(BASESET_DIR, GetDefaultTruetypeFont(fs)); return FioFindFullPath(BASESET_DIR, GetDefaultTruetypeFont(fs));
#endif /* defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) */ #else
return {}; return {};
#endif /* defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) */
} }
/** /**