From 107e292a94dbc899f1652c93652f9c5c64735e4c Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 13 Feb 2011 01:07:28 +0100 Subject: [PATCH] Freetype customization for arm non-thumb builds --- 3party/freetype/custom/ftoption.h | 5 +++-- 3party/freetype/include/freetype/config/ftoption.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/3party/freetype/custom/ftoption.h b/3party/freetype/custom/ftoption.h index 5f4365b416..7f496054b2 100644 --- a/3party/freetype/custom/ftoption.h +++ b/3party/freetype/custom/ftoption.h @@ -121,8 +121,9 @@ FT_BEGIN_HEADER /* performance-critical functions (e.g. FT_MulFix). You should only do */ /* that to verify that the assembler function works properly, or to */ /* execute benchmark tests of the various implementations. */ -/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */ - +#if defined( __arm__ ) && !defined( __thumb__ ) +#define FT_CONFIG_OPTION_NO_ASSEMBLER +#endif /*************************************************************************/ /* */ diff --git a/3party/freetype/include/freetype/config/ftoption.h b/3party/freetype/include/freetype/config/ftoption.h index 664b4deac8..8c09be4ec0 100644 --- a/3party/freetype/include/freetype/config/ftoption.h +++ b/3party/freetype/include/freetype/config/ftoption.h @@ -121,7 +121,9 @@ FT_BEGIN_HEADER /* performance-critical functions (e.g. FT_MulFix). You should only do */ /* that to verify that the assembler function works properly, or to */ /* execute benchmark tests of the various implementations. */ -/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */ +#if defined( __arm__ ) && !defined( __thumb__ ) +#define FT_CONFIG_OPTION_NO_ASSEMBLER +#endif /*************************************************************************/