cpp/openttd-patchpack/source Changeset - r23999:b45b5e31e9de

Changeset - r23999:b45b5e31e9de

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Niels Martin Hansen - 4 years ago 2019-12-26 18:36:23
nielsm@indvikleren.dk

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

1 file changed with 2 insertions and 2 deletions:

src/bootstrap_gui.cpp

0 comments (0 inline, 0 general)

src/bootstrap_gui.cpp

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file bootstrap_gui.cpp Barely used user interface for bootstrapping OpenTTD, i.e. downloading the required content. */
 #include "stdafx.h"
 #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"
 #include "gfx_func.h"
 #include "network/network.h"
 #include "network/network_content_gui.h"
@@ @@ -215,13 +215,13 @@ bool HandleBootstrap() @@
 	if (BaseGraphics::GetUsedSet() != nullptr) return true;
 	/* No user interface, bail out with an error. */
 	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. */
 	_game_mode = GM_BOOTSTRAP;
 	/* Initialise the freetype font code. */

0 comments (0 inline, 0 general)