Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Zolotarev <deathbaba@gmail.com>2011-02-13 03:07:28 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:12:18 +0300
commit107e292a94dbc899f1652c93652f9c5c64735e4c (patch)
treed2afa4fc28e1d41f120c35d0aaadb3e084fb0c6c /3party/freetype
parentfbb107dbaf9b0a708b9513357d0c3d9cf13e190a (diff)
Freetype customization for arm non-thumb builds
Diffstat (limited to '3party/freetype')
-rw-r--r--3party/freetype/custom/ftoption.h5
-rw-r--r--3party/freetype/include/freetype/config/ftoption.h4
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
/*************************************************************************/