diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-04-28 18:37:40 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-04-28 18:41:39 +0900 |
commit | aa92cddb8ba9b539f2e1c34d87005e1536001e4a (patch) | |
tree | b6ce7e8a95c6f71e3a41a479a5acb567b7b29201 /src/lib/evas/common | |
parent | b2ca7a96dcb49aec273d5655aee1140ea80464b3 (diff) |
evas font code - build on older freetypes without new definitions
use the actual #35 as:
in freetype and it cant change without breaking abi...
@fix
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r-- | src/lib/evas/common/evas_font_main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c index ba56848df1..91db4d52ec 100644 --- a/src/lib/evas/common/evas_font_main.c +++ b/src/lib/evas/common/evas_font_main.c | |||
@@ -30,14 +30,19 @@ evas_common_font_init(void) | |||
30 | { | 30 | { |
31 | int error; | 31 | int error; |
32 | const char *s; | 32 | const char *s; |
33 | FT_UInt interpreter_version = TT_INTERPRETER_VERSION_35; | 33 | FT_UInt interpreter_version = |
34 | #ifndef TT_INTERPRETER_VERSION_35 | ||
35 | TT_INTERPRETER_VERSION_35; | ||
36 | #else | ||
37 | 35; | ||
38 | #endif | ||
34 | 39 | ||
35 | initialised++; | 40 | initialised++; |
36 | if (initialised != 1) return; | 41 | if (initialised != 1) return; |
37 | error = FT_Init_FreeType(&evas_ft_lib); | 42 | error = FT_Init_FreeType(&evas_ft_lib); |
38 | if (error) return; | 43 | if (error) return; |
39 | FT_Property_Set(evas_ft_lib, | 44 | FT_Property_Set(evas_ft_lib, "truetype", "interpreter-version", |
40 | "truetype", "interpreter-version", &interpreter_version); | 45 | &interpreter_version); |
41 | evas_common_font_load_init(); | 46 | evas_common_font_load_init(); |
42 | evas_common_font_draw_init(); | 47 | evas_common_font_draw_init(); |
43 | s = getenv("EVAS_FONT_DPI"); | 48 | s = getenv("EVAS_FONT_DPI"); |