mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: Let bootstrap GUI work on Win32 with Uniscribe but no Freetype

This commit is contained in:
Niels Martin Hansen 2019-12-26 19:36:23 +01:00
parent a6901f8ae8
commit 7f25032766
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap_gui.cpp
View File

@ -11,7 +11,7 @@
#include "base_media_base.h"
#include "blitter/factory.hpp"
#if defined(WITH_FREETYPE)
#if defined(WITH_FREETYPE) || defined(WITH_UNISCRIBE)
#include "core/geometry_func.hpp"
#include "fontcache.h"
@ -218,7 +218,7 @@ bool HandleBootstrap()
if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 0) goto failure;
/* If there is no network or no freetype, then there is nothing we can do. Go straight to failure. */
#if defined(WITH_FREETYPE) && (defined(WITH_FONTCONFIG) || defined(_WIN32) || defined(__APPLE__))
#if (defined(_WIN32) && defined(WITH_UNISCRIBE)) || (defined(WITH_FREETYPE) && (defined(WITH_FONTCONFIG) || defined(__APPLE__)))
if (!_network_available) goto failure;
/* First tell the game we're bootstrapping. */