From 4f02132f9323a147c68b7dc1a79a62be33c1f170 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 2 Mar 2014 05:21:50 -0600 Subject: Make our architecture defines less stupid. Our defines were never clear between what meant 64bit or x86_64 This makes a clear cut between bitness and architecture. This commit also has the side effect of bringing up aarch64 compiling support. --- Source/Core/Common/Version.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Source/Core/Common/Version.cpp') diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 1223bf373d..0e282ad7e8 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -24,14 +24,16 @@ const char *scm_rev_str = "Dolphin " BUILD_TYPE_STR SCM_DESC_STR; #endif -#ifdef _M_X64 +#if _M_X86_64 #define NP_ARCH "x64" -#else -#ifdef _M_ARM -#define NP_ARCH "ARM" -#else +#elif _M_ARM_32 +#define NP_ARCH "ARM32" +#elif _M_ARM_64 +#define NP_ARCH "ARM64" +#elif _M_X86_32 #define NP_ARCH "x86" -#endif +#else +#define NP_ARCH "Unk" #endif #ifdef _WIN32 -- cgit v1.2.3