diff options
| author | Patric Stout <truebrain@openttd.org> | 2019-03-10 16:43:59 +0100 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2019-03-11 10:16:00 +0100 |
| commit | 52d7e7d45e0a2a6033942602ed9fdec821a7d2af (patch) | |
| tree | 4db1138219b406c775dfad6e85432209ce004b92 /src/gfx_layout.h | |
| parent | 7adae09897c6f17a60de9468e9e11d166ff52278 (diff) | |
| download | openttd-52d7e7d45e0a2a6033942602ed9fdec821a7d2af.tar.xz | |
Codechange: ICU_LAYOUT is in reality ICU_LX (according to their CMake files)
By naming it in a different way, things get a bit confusing.
Especially if we are switching to CMake, which autodetects these
things, we need to use the name the authors of ICU gave it; not
our interpertation of that name.
Diffstat (limited to 'src/gfx_layout.h')
| -rw-r--r-- | src/gfx_layout.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gfx_layout.h b/src/gfx_layout.h index 94cbac073..6f611d6e6 100644 --- a/src/gfx_layout.h +++ b/src/gfx_layout.h @@ -21,12 +21,12 @@ #include <stack> #include <vector> -#ifdef WITH_ICU_LAYOUT +#ifdef WITH_ICU_LX #include "layout/ParagraphLayout.h" #define ICU_FONTINSTANCE : public icu::LEFontInstance -#else /* WITH_ICU_LAYOUT */ +#else /* WITH_ICU_LX */ #define ICU_FONTINSTANCE -#endif /* WITH_ICU_LAYOUT */ +#endif /* WITH_ICU_LX */ /** * Text drawing parameters, which can change while drawing a line, but are kept between multiple parts @@ -89,7 +89,7 @@ public: Font(FontSize size, TextColour colour); -#ifdef WITH_ICU_LAYOUT +#ifdef WITH_ICU_LX /* Implementation details of LEFontInstance */ le_int32 getUnitsPerEM() const; @@ -105,7 +105,7 @@ public: LEGlyphID mapCharToGlyph(LEUnicode32 ch) const; void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const; le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const; -#endif /* WITH_ICU_LAYOUT */ +#endif /* WITH_ICU_LX */ }; /** Mapping from index to font. */ |