From 36b6542bf36d233a7a28826366dfc80158c66c59 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 15 Feb 2020 12:24:43 -0600 Subject: [PATCH] [ox/std] Fix hardware detection to work in MSVC --- deps/ox/src/ox/std/hardware.hpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/deps/ox/src/ox/std/hardware.hpp b/deps/ox/src/ox/std/hardware.hpp index a1426fca..6cb13436 100644 --- a/deps/ox/src/ox/std/hardware.hpp +++ b/deps/ox/src/ox/std/hardware.hpp @@ -8,7 +8,17 @@ #pragma once -#if defined(__arm__) +#if defined(__x86_64__) || defined(_M_AMD64) +#define OX_ARCH_x86_64 +#elif defined(__i386__ || defined(_M_IX86) +#define OX_ARCH_x86_32 +#elif defined(_M_AMD64) +#define OX_ARCH_ARM64 +#elif defined(__arm__) +#define OX_ARCH_ARM +#endif + +#if defined(OX_ARCH_ARM) #if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) #define OX_HW_DIV 1 @@ -16,7 +26,7 @@ #define OX_HW_DIV 0 #endif -#elif defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#elif defined(OX_ARCH_x86_32) || defined(OX_ARCH_x86_64) || defined(OX_ARCH_ARM64) #define OX_HW_DIV 1