Browse Source

Further iOS FreeType fix.

Lasse Öörni 12 years ago
parent
commit
0b938bf1ae
1 changed files with 4 additions and 3 deletions
  1. 4 3
      Source/ThirdParty/FreeType/src/truetype/ttinterp.c

+ 4 - 3
Source/ThirdParty/FreeType/src/truetype/ttinterp.c

@@ -15,6 +15,7 @@
 /*                                                                         */
 /*                                                                         */
 /***************************************************************************/
 /***************************************************************************/
 
 
+// Modified by Lasse Oorni for Urho3D
 
 
 /* Greg Hitchcock from Microsoft has helped a lot in resolving unclear */
 /* Greg Hitchcock from Microsoft has helped a lot in resolving unclear */
 /* issues; many thanks!                                                */
 /* issues; many thanks!                                                */
@@ -1440,8 +1441,8 @@
 
 
 #ifndef FT_CONFIG_OPTION_NO_ASSEMBLER
 #ifndef FT_CONFIG_OPTION_NO_ASSEMBLER
 
 
-#if defined( __arm__ )                                 && \
-    ( defined( __thumb2__ ) || !defined( __thumb__ ) )
+// Urho3D: modified architecture check
+#if defined( __arm__ ) && !defined( __thumb__ )
 
 
 #define TT_MulFix14  TT_MulFix14_arm
 #define TT_MulFix14  TT_MulFix14_arm
 
 
@@ -1484,7 +1485,7 @@
     return a;
     return a;
   }
   }
 
 
-#endif /* __arm__ && ( __thumb2__ || !__thumb__ ) */
+#endif /* __arm__ && !__thumb__ */
 
 
 #endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
 #endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */