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

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.
This commit is contained in:
Patric Stout 2019-03-10 16:43:59 +01:00
parent 7adae09897
commit 52d7e7d45e
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile
View File

@ -298,7 +298,7 @@ PREDEFINED = ENABLE_NETWORK \
WITH_FONTCONFIG \ WITH_FONTCONFIG \
WITH_FREETYPE \ WITH_FREETYPE \
WITH_ICU_SORT \ WITH_ICU_SORT \
WITH_ICU_LAYOUT \ WITH_ICU_LX \
UNICODE \ UNICODE \
_UNICODE \ _UNICODE \
_GNU_SOURCE \ _GNU_SOURCE \

2
config.lib
View File

@ -1765,7 +1765,7 @@ make_cflags_and_ldflags() {
fi fi
if [ -n "$icu_layout_config" ]; then if [ -n "$icu_layout_config" ]; then
CFLAGS="$CFLAGS -DWITH_ICU_LAYOUT" CFLAGS="$CFLAGS -DWITH_ICU_LX"
CFLAGS="$CFLAGS `$icu_layout_config --cflags | tr '\n\r' ' '`" CFLAGS="$CFLAGS `$icu_layout_config --cflags | tr '\n\r' ' '`"
if [ "$static_icu" != "0" ]; then if [ "$static_icu" != "0" ]; then

10
src/crashlog.cpp
View File

@ -52,9 +52,9 @@
# include <ft2build.h> # include <ft2build.h>
# include FT_FREETYPE_H # include FT_FREETYPE_H
#endif /* WITH_FREETYPE */ #endif /* WITH_FREETYPE */
#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT) #if defined(WITH_ICU_LX) || defined(WITH_ICU_SORT)
# include <unicode/uversion.h> # include <unicode/uversion.h>
#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */ #endif /* WITH_ICU_LX || WITH_ICU_SORT */
#ifdef WITH_LIBLZMA #ifdef WITH_LIBLZMA
# include <lzma.h> # include <lzma.h>
#endif #endif
@ -240,7 +240,7 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
buffer += seprintf(buffer, last, " FreeType: %d.%d.%d\n", major, minor, patch); buffer += seprintf(buffer, last, " FreeType: %d.%d.%d\n", major, minor, patch);
#endif /* WITH_FREETYPE */ #endif /* WITH_FREETYPE */
#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT) #if defined(WITH_ICU_LX) || defined(WITH_ICU_SORT)
/* 4 times 0-255, separated by dots (.) and a trailing '\0' */ /* 4 times 0-255, separated by dots (.) and a trailing '\0' */
char buf[4 * 3 + 3 + 1]; char buf[4 * 3 + 3 + 1];
UVersionInfo ver; UVersionInfo ver;
@ -249,10 +249,10 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
#ifdef WITH_ICU_SORT #ifdef WITH_ICU_SORT
buffer += seprintf(buffer, last, " ICU i18n: %s\n", buf); buffer += seprintf(buffer, last, " ICU i18n: %s\n", buf);
#endif #endif
#ifdef WITH_ICU_LAYOUT #ifdef WITH_ICU_LX
buffer += seprintf(buffer, last, " ICU lx: %s\n", buf); buffer += seprintf(buffer, last, " ICU lx: %s\n", buf);
#endif #endif
#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */ #endif /* WITH_ICU_LX || WITH_ICU_SORT */
#ifdef WITH_LIBLZMA #ifdef WITH_LIBLZMA
buffer += seprintf(buffer, last, " LZMA: %s\n", lzma_version_string()); buffer += seprintf(buffer, last, " LZMA: %s\n", lzma_version_string());

12
src/gfx_layout.cpp
View File

@ -17,9 +17,9 @@
#include "table/control_codes.h" #include "table/control_codes.h"
#ifdef WITH_ICU_LAYOUT #ifdef WITH_ICU_LX
#include <unicode/ustring.h> #include <unicode/ustring.h>
#endif /* WITH_ICU_LAYOUT */ #endif /* WITH_ICU_LX */
#ifdef WITH_UNISCRIBE #ifdef WITH_UNISCRIBE
#include "os/windows/string_uniscribe.h" #include "os/windows/string_uniscribe.h"
@ -50,7 +50,7 @@ Font::Font(FontSize size, TextColour colour) :
assert(size < FS_END); assert(size < FS_END);
} }
#ifdef WITH_ICU_LAYOUT #ifdef WITH_ICU_LX
/* Implementation details of LEFontInstance */ /* Implementation details of LEFontInstance */
le_int32 Font::getUnitsPerEM() const le_int32 Font::getUnitsPerEM() const
@ -226,7 +226,7 @@ public:
return length; return length;
} }
}; };
#endif /* WITH_ICU_LAYOUT */ #endif /* WITH_ICU_LX */
/*** Paragraph layout ***/ /*** Paragraph layout ***/
/** /**
@ -674,11 +674,11 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
} else { } else {
/* Line is new, layout it */ /* Line is new, layout it */
FontState old_state = state; FontState old_state = state;
#if defined(WITH_ICU_LAYOUT) || defined(WITH_UNISCRIBE) || defined(WITH_COCOA) #if defined(WITH_ICU_LX) || defined(WITH_UNISCRIBE) || defined(WITH_COCOA)
const char *old_str = str; const char *old_str = str;
#endif #endif
#ifdef WITH_ICU_LAYOUT #ifdef WITH_ICU_LX
GetLayouter<ICUParagraphLayoutFactory>(line, str, state); GetLayouter<ICUParagraphLayoutFactory>(line, str, state);
if (line.layout == NULL) { if (line.layout == NULL) {
static bool warned = false; static bool warned = false;

10
src/gfx_layout.h
View File

@ -21,12 +21,12 @@
#include <stack> #include <stack>
#include <vector> #include <vector>
#ifdef WITH_ICU_LAYOUT #ifdef WITH_ICU_LX
#include "layout/ParagraphLayout.h" #include "layout/ParagraphLayout.h"
#define ICU_FONTINSTANCE : public icu::LEFontInstance #define ICU_FONTINSTANCE : public icu::LEFontInstance
#else /* WITH_ICU_LAYOUT */ #else /* WITH_ICU_LX */
#define ICU_FONTINSTANCE #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 * 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); Font(FontSize size, TextColour colour);
#ifdef WITH_ICU_LAYOUT #ifdef WITH_ICU_LX
/* Implementation details of LEFontInstance */ /* Implementation details of LEFontInstance */
le_int32 getUnitsPerEM() const; le_int32 getUnitsPerEM() const;
@ -105,7 +105,7 @@ public:
LEGlyphID mapCharToGlyph(LEUnicode32 ch) const; LEGlyphID mapCharToGlyph(LEUnicode32 ch) const;
void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const; void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const;
le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) 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. */ /** Mapping from index to font. */

4
src/strings.cpp
View File

@ -2138,7 +2138,7 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
/* Update the font with cache */ /* Update the font with cache */
LoadStringWidthTable(searcher->Monospace()); LoadStringWidthTable(searcher->Monospace());
#if !defined(WITH_ICU_LAYOUT) && !defined(WITH_UNISCRIBE) && !defined(WITH_COCOA) #if !defined(WITH_ICU_LX) && !defined(WITH_UNISCRIBE) && !defined(WITH_COCOA)
/* /*
* For right-to-left languages we need the ICU library. If * For right-to-left languages we need the ICU library. If
* we do not have support for that library we warn the user * we do not have support for that library we warn the user
@ -2158,5 +2158,5 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
SetDParamStr(0, err_str); SetDParamStr(0, err_str);
ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR);
} }
#endif /* !WITH_ICU_LAYOUT */ #endif /* !WITH_ICU_LX */
} }