Skip to content

Commit

Permalink
Fix NO_TTF builds for Windows and macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
janisozaur authored and Gymnasiast committed Mar 9, 2018
1 parent 35f3d9f commit 229c793
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/openrct2/platform/Windows.cpp
Expand Up @@ -444,6 +444,7 @@ uint8 platform_get_locale_date_format()
return DATE_FORMAT_DAY_MONTH_YEAR;
}

#ifndef NO_TTF
bool platform_get_font_path(TTFFontDescriptor *font, utf8 *buffer, size_t size)
{
#if !defined(__MINGW32__) && ((NTDDI_VERSION >= NTDDI_VISTA) && !defined(_USING_V110_SDK71_) && !defined(_ATL_XP_TARGETING))
Expand Down Expand Up @@ -472,6 +473,7 @@ bool platform_get_font_path(TTFFontDescriptor *font, utf8 *buffer, size_t size)
return true;
#endif
}
#endif // NO_TTF

utf8 * platform_get_absolute_path(const utf8 * relativePath, const utf8 * basePath)
{
Expand Down
2 changes: 2 additions & 0 deletions src/openrct2/platform/macos.mm
Expand Up @@ -47,6 +47,7 @@ void macos_disallow_automatic_window_tabbing()
}
}

#ifndef NO_TTF
bool platform_get_font_path(TTFFontDescriptor *font, utf8 *buffer, size_t size)
{
@autoreleasepool
Expand All @@ -62,6 +63,7 @@ bool platform_get_font_path(TTFFontDescriptor *font, utf8 *buffer, size_t size)
}
}
}
#endif // NO_TTF

bool platform_has_matching_language(NSString *preferredLocale, uint16* languageIdentifier)
{
Expand Down

0 comments on commit 229c793

Please sign in to comment.