diff options
| author | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-26 19:36:23 +0100 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-26 19:50:07 +0100 |
| commit | 7f250327665af8452a74073c28d6f8e287feeff1 (patch) | |
| tree | 6f05efd6615b6d8a62a71c1f2e105332b6e4a1b2 /src | |
| parent | a6901f8ae8fd1620b812598c336e33b9c07f6942 (diff) | |
| download | openttd-7f250327665af8452a74073c28d6f8e287feeff1.tar.xz | |
Fix: Let bootstrap GUI work on Win32 with Uniscribe but no Freetype
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp index 29b066cd1..45cd01024 100644 --- a/src/bootstrap_gui.cpp +++ b/src/bootstrap_gui.cpp @@ -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. */ |