summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-06-23 18:32:02 +0000
committerrubidium <rubidium@openttd.org>2013-06-23 18:32:02 +0000
commitaa3c1068434f7ec22ffddec2d218037ff06bddd0 (patch)
tree3d4a0f8ceb61de480bb74dfe25d66f88855e5915 /src
parentab4bd1120839ac12eeda5b615d36c683821b01e7 (diff)
downloadopenttd-aa3c1068434f7ec22ffddec2d218037ff06bddd0.tar.xz
(svn r25450) -Fix: compilation without freetype
Diffstat (limited to 'src')
-rw-r--r--src/fontdetection.cpp4
-rw-r--r--src/fontdetection.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/fontdetection.cpp b/src/fontdetection.cpp
index 6e9e78ae2..306426863 100644
--- a/src/fontdetection.cpp
+++ b/src/fontdetection.cpp
@@ -9,6 +9,8 @@
/** @file fontdetection.cpp Detection of the right font. */
+#ifdef WITH_FREETYPE
+
#include "stdafx.h"
#include "debug.h"
#include "fontdetection.h"
@@ -774,3 +776,5 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) {return FT_Err_Cannot_Open_Resource;}
bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback) { return false; }
#endif /* WITH_FONTCONFIG */
+
+#endif /* WITH_FREETYPE */
diff --git a/src/fontdetection.h b/src/fontdetection.h
index 5023ea8dd..edb961e6d 100644
--- a/src/fontdetection.h
+++ b/src/fontdetection.h
@@ -12,9 +12,10 @@
#ifndef FONTDETECTION_H
#define FONTDETECTION_H
+#include "fontcache.h"
+
#ifdef WITH_FREETYPE
-#include "fontcache.h"
#include <ft2build.h>
#include FT_FREETYPE_H