[Scummvm-git-logs] scummvm master -> 41798fca5d366d13c70a4ca7a7f07affbe7adbcc

[SupSuper]

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:
41798fca5d GRAPHICS: MACGUI: FreeType required for Win95 fonts


Commit: 41798fca5d366d13c70a4ca7a7f07affbe7adbcc
    https://github.com/scummvm/scummvm/commit/41798fca5d366d13c70a4ca7a7f07affbe7adbcc
Author: SupSuper (supsuper at gmail.com)
Date: 2021-05-01T07:44:05+01:00

Commit Message:
GRAPHICS: MACGUI: FreeType required for Win95 fonts

Fixes compilation on platforms without FreeType

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 3a68ddd010..7a32d0c566 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -585,6 +585,7 @@ void MacMenu::createSubMenuFromString(int id, const char *str, int commandId) {
 }
 
 const Font *MacMenu::getMenuFont(int slant) {
+#ifdef USE_FREETYPE2
 	if (_wm->_mode & kWMModeWin95) {
 		if (!_loadedFont) {
 			_loadedFont = Graphics::loadTTFFontFromArchive("ms_sans_serif.ttf", 16);
@@ -597,6 +598,7 @@ const Font *MacMenu::getMenuFont(int slant) {
 
 		// If font was not loaded, fallback
 	}
+#endif
 
 	return _wm->_fontMan->getFont(Graphics::MacFont(kMacFontChicago, 12, slant));
 }