From cb82318c36f411391021570906241cb7f6fa56c3 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Fri, 22 Mar 2019 03:09:11 +0200 Subject: [PATCH] [General] Fix problems with Utils::getArchitectureType() --- components/openmw-mp/Utils.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/openmw-mp/Utils.cpp b/components/openmw-mp/Utils.cpp index 3e7fb3e8e..64d5aa479 100644 --- a/components/openmw-mp/Utils.cpp +++ b/components/openmw-mp/Utils.cpp @@ -192,15 +192,16 @@ std::string Utils::getArchitectureType() { #if defined(__x86_64__) || defined(_M_X64) return "64-bit"; -#elif defined(__i386__) || defined(_M_I86) +#elif defined(__i386__) || defined(_M_I86) || defined(_M_IX86) return "32-bit"; #elif defined(__ARM_ARCH) - return "ARMv" + __ARM_ARCH; + std::string architectureType = "ARMv" + __ARM_ARCH; #ifdef __aarch64__ - return "64-bit"; + architectureType = architectureType + " 64-bit"; #else - return "32-bit"; + architectureType = architectureType + " 32-bit"; #endif + return architectureType; #else return "Unknown architecture"; #endif