From b0b2b9c8f748a9e8d2e0c1ffbd6e09df5f385aeb Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 29 Dec 2014 14:37:35 +0400 Subject: Set the minimum required FreeType version to 2.1.10 ...and get rid of workarounds for older versions, which also makes the code more readable. Change-Id: I087110c5f60cd664dad241776e1a0df901989c75 Reviewed-by: Lars Knoll --- config.tests/unix/fontconfig/fontconfig.cpp | 2 +- config.tests/unix/freetype/freetype.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config.tests/unix') diff --git a/config.tests/unix/fontconfig/fontconfig.cpp b/config.tests/unix/fontconfig/fontconfig.cpp index 6d0eb71cbd..9348214899 100644 --- a/config.tests/unix/fontconfig/fontconfig.cpp +++ b/config.tests/unix/fontconfig/fontconfig.cpp @@ -39,7 +39,7 @@ # error "This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define" #endif -#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103) +#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110) # error "This version of freetype is too old." #endif diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp index dd337fd7e8..210bd67468 100644 --- a/config.tests/unix/freetype/freetype.cpp +++ b/config.tests/unix/freetype/freetype.cpp @@ -34,7 +34,7 @@ #include #include FT_FREETYPE_H -#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103) +#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110) # error "This version of freetype is too old." #endif -- cgit v1.2.3