diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-05 09:26:02 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-05 09:26:02 +1300 |
| commit | 09212d49121d57f2fc670af64c71f4ff731c14ba (patch) | |
| tree | 3941a217046e39148768a1c7eb1aff0289251d4b /Source/Core/Common/Version.cpp | |
| parent | d1ccd964cd7c552068c1ed649235eac83e3b1195 (diff) | |
| parent | 4f02132f9323a147c68b7dc1a79a62be33c1f170 (diff) | |
Merge pull request #120 from Sonicadvance1/Arch-clean
Make our architecture defines less stupid.
Diffstat (limited to 'Source/Core/Common/Version.cpp')
| -rw-r--r-- | Source/Core/Common/Version.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
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 |