Ver Fonte

Fix AngelScript library to support Android ABI arm64-v8a (untested).

Yao Wei Tjong 姚伟忠 há 11 anos atrás
pai
commit
733b0bbaeb
1 ficheiros alterados com 7 adições e 1 exclusões
  1. 7 1
      Source/ThirdParty/AngelScript/source/as_config.h

+ 7 - 1
Source/ThirdParty/AngelScript/source/as_config.h

@@ -985,7 +985,7 @@
 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
 			#define AS_X86
 			#define AS_X86
 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-// Urho3D - Add support for Android Intel x86_64
+// Urho3D - Add support for Android Intel x86_64 and Android ARM 64bit
 		#elif defined(__LP64__) && !defined(__aarch64__)
 		#elif defined(__LP64__) && !defined(__aarch64__)
 			// Android Intel x86_64 (same config as Linux x86_64). Tested with Intel x86_64 Atom System Image.
 			// Android Intel x86_64 (same config as Linux x86_64). Tested with Intel x86_64 Atom System Image.
 			#define AS_X64_GCC
 			#define AS_X64_GCC
@@ -997,6 +997,12 @@
 			// STDCALL is not available on 64bit Linux
 			// STDCALL is not available on 64bit Linux
 			#undef STDCALL
 			#undef STDCALL
 			#define STDCALL
 			#define STDCALL
+        #elif defined(__aarch64__)
+			// Doesn't support native calling for Android ARM 64bit yet
+			#define AS_MAX_PORTABILITY
+			// STDCALL is not available on ARM
+			#undef STDCALL
+			#define STDCALL
 		#endif
 		#endif
 
 
 	// Haiku OS
 	// Haiku OS