From 7b1c018f538f818d85b24ea2f7e8326c77d41add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 28 Aug 2016 14:54:38 +0000 Subject: [PATCH] Improve architecture detection macros --- src/version.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/version.h b/src/version.h index d2fdf1e79c..1727779658 100644 --- a/src/version.h +++ b/src/version.h @@ -22,10 +22,18 @@ #define OPENRCT2_NAME "OpenRCT2" #define OPENRCT2_VERSION "0.0.5" -#if defined(__LP64__) || defined(_WIN64) - #define OPENRCT2_ARCHITECTURE "x64" -#else +#if defined(__amd64__) || defined(_M_AMD64) + #define OPENRCT2_ARCHITECTURE "x86-64" +#elif defined(__i386__) || defined(_M_IX86) #define OPENRCT2_ARCHITECTURE "x86" +#elif defined(__aarch64__) + #define OPENRCT2_ARCHITECTURE "AArch64" +#elif defined(__arm__) || defined(_M_ARM) + #define OPENRCT2_ARCHITECTURE "ARMv7" +#endif + +#ifndef OPENRCT2_ARCHITECTURE + #error "OPENRCT2_ARCHITECTURE is undefined. Please add identification." #endif // Platform