Merge pull request #4153 from FearlessTobi/port-1066

Port #1066 from yuzu: "CMakeLists: Add architecture detection for AArch64"
This commit is contained in:
Pengfei Zhu 2018-08-31 12:56:58 +08:00 committed by GitHub
commit f82517f91d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -85,10 +85,12 @@ if (NOT ENABLE_GENERIC)
detect_architecture("_M_AMD64" x86_64) detect_architecture("_M_AMD64" x86_64)
detect_architecture("_M_IX86" x86) detect_architecture("_M_IX86" x86)
detect_architecture("_M_ARM" ARM) detect_architecture("_M_ARM" ARM)
detect_architecture("_M_ARM64" ARM64)
else() else()
detect_architecture("__x86_64__" x86_64) detect_architecture("__x86_64__" x86_64)
detect_architecture("__i386__" x86) detect_architecture("__i386__" x86)
detect_architecture("__arm__" ARM) detect_architecture("__arm__" ARM)
detect_architecture("__aarch64__" ARM64)
endif() endif()
endif() endif()
if (NOT DEFINED ARCHITECTURE) if (NOT DEFINED ARCHITECTURE)