diff options
| author |  Yuri Kunde Schlesner | 2015-05-07 15:06:27 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-07 15:06:27 -0700 |
| commit | 52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b (patch) | |
| tree | 352d4e078789f31408c8f8658ba84cc03c08cbcf /src/common/platform.h | |
| parent | Merge pull request #721 from yuriks/more-cleanups (diff) | |
| parent | Common: Add proper macros to test for architecture pointer size (diff) | |
| download | yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.tar.gz yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.tar.xz yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.zip | |
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 1516dc88a..df780ac6f 100644 --- a/src/common/platform.h +++ b/src/common/platform.h | |||
| @@ -57,10 +57,10 @@ | |||
| 57 | 57 | ||
| 58 | #endif | 58 | #endif |
| 59 | 59 | ||
| 60 | #if defined(__x86_64__) || defined(_M_X64) || defined(__alpha__) || defined(__ia64__) | 60 | #if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) |
| 61 | #define EMU_ARCHITECTURE_X64 | 61 | #define EMU_ARCH_BITS 64 |
| 62 | #else | 62 | #elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) |
| 63 | #define EMU_ARCHITECTURE_X86 | 63 | #define EMU_ARCH_BITS 32 |
| 64 | #endif | 64 | #endif |
| 65 | 65 | ||
| 66 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 66 | //////////////////////////////////////////////////////////////////////////////////////////////////// |