From 229c793b334fe15cc8246415bde3930adf4cca0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 9 Mar 2018 16:40:40 +0100 Subject: [PATCH] Fix NO_TTF builds for Windows and macOS --- src/openrct2/platform/Windows.cpp | 2 ++ src/openrct2/platform/macos.mm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/openrct2/platform/Windows.cpp b/src/openrct2/platform/Windows.cpp index 4c894de051..5775293d6a 100644 --- a/src/openrct2/platform/Windows.cpp +++ b/src/openrct2/platform/Windows.cpp @@ -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)) @@ -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) { diff --git a/src/openrct2/platform/macos.mm b/src/openrct2/platform/macos.mm index 4234ff2507..7ba4e92b25 100644 --- a/src/openrct2/platform/macos.mm +++ b/src/openrct2/platform/macos.mm @@ -47,6 +47,7 @@ utf8* macos_str_decomp_to_precomp(utf8 *input) } } +#ifndef NO_TTF bool platform_get_font_path(TTFFontDescriptor *font, utf8 *buffer, size_t size) { @autoreleasepool @@ -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) {