[Scummvm-git-logs] scummvm master -> 4d8a0f22f2001447f4790bfcd2041eccda0b723a

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4d8a0f22f2 GRAPHICS: MACGUI: Fix compilation without freetype


Commit: 4d8a0f22f2001447f4790bfcd2041eccda0b723a
    https://github.com/scummvm/scummvm/commit/4d8a0f22f2001447f4790bfcd2041eccda0b723a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-18T09:27:33+02:00

Commit Message:
GRAPHICS: MACGUI: Fix compilation without freetype

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 4faafa4..259fd15 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -284,11 +284,13 @@ const Font *MacFontManager::getFont(MacFont macFont) {
 		}
 	}
 
-	if (_builtInFonts || !font) {
+#ifdef USE_FREETYPE2
+	if (!font) {
 		if (_mode & kWMModeUnicode) {
 			font = Graphics::loadTTFFontFromArchive("FreeSans.ttf", 16, Graphics::kTTFSizeModeCell, 0, Graphics::kTTFRenderModeMonochrome);
 		}
 	}
+#endif
 
 	if (!font)
 		font = FontMan.getFontByUsage(macFont.getFallback());