diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 15:06:27 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 15:06:27 -0700 |
| commit | 52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b (patch) | |
| tree | 352d4e078789f31408c8f8658ba84cc03c08cbcf /src/common/platform.h | |
| parent | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (diff) | |
| parent | fae5933ad614ca8c2559f499ebe16b518594cca3 (diff) | |
Merge pull request #724 from citra-emu/arch-misdetection
Common: Add proper macros to test for architecture pointer size
Diffstat (limited to 'src/common/platform.h')
| -rw-r--r-- | src/common/platform.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/platform.h b/src/common/platform.h index 1516dc88..df780ac6 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -57,10 +57,10 @@ #endif -#if defined(__x86_64__) || defined(_M_X64) || defined(__alpha__) || defined(__ia64__) -#define EMU_ARCHITECTURE_X64 -#else -#define EMU_ARCHITECTURE_X86 +#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) + #define EMU_ARCH_BITS 64 +#elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) + #define EMU_ARCH_BITS 32 #endif //////////////////////////////////////////////////////////////////////////////////////////////////// |