[Scummvm-git-logs] scummvm master -> 883e60abc2c559d2faecdb6bf1daf6ea1f001c6f

[mduggan]

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:
883e60abc2 ULTIMA: Allow engine to build without freetype


Commit: 883e60abc2c559d2faecdb6bf1daf6ea1f001c6f
    https://github.com/scummvm/scummvm/commit/883e60abc2c559d2faecdb6bf1daf6ea1f001c6f
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-20T21:47:22+09:00

Commit Message:
ULTIMA: Allow engine to build without freetype

Disables TTF support in U8, but otherwise works fine.

Changed paths:
    engines/ultima/configure.engine
    engines/ultima/ultima8/graphics/fonts/font_manager.cpp


diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
index 704a79d1f6..291efd035c 100644
--- a/engines/ultima/configure.engine
+++ b/engines/ultima/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"
+add_engine ultima "Ultima" yes "" "" "highres 16bit lua"
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
index 489fad0d1d..3ac8c7e198 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
@@ -109,6 +109,7 @@ Graphics::Font *FontManager::getTTF_Font(const Std::string &filename, int points
 		return nullptr;
 	}
 
+#ifdef USE_FREETYPE2
 	// open font using ScummVM TTF API
 	// Note: The RWops and ReadStream will be deleted by the TTF_Font
 	Graphics::Font *font = Graphics::loadTTFFont(*fontids, pointsize);
@@ -125,6 +126,9 @@ Graphics::Font *FontManager::getTTF_Font(const Std::string &filename, int points
 #endif
 
 	return font;
+#else // !USE_FREETYPE2
+	return nullptr;
+#endif
 }
 
 void FontManager::setOverride(unsigned int fontnum, Font *newFont) {