From c697d0bad55b97a36a2f5453174fedd5aca6d02a Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Thu, 8 Aug 2019 11:49:30 -0700 Subject: [PATCH] Add MSVC defines for ARM and ARM64 NVTT contains a mechanism for recognizing architecture from compiler predefines. Added MSVC ARM and ARM64 predefines to this mechanism, which allows bimg to build for UWP on those architectures. --- 3rdparty/nvtt/nvcore/posh.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdparty/nvtt/nvcore/posh.h b/3rdparty/nvtt/nvcore/posh.h index b597125..acf8bc9 100644 --- a/3rdparty/nvtt/nvcore/posh.h +++ b/3rdparty/nvtt/nvcore/posh.h @@ -490,12 +490,12 @@ LLVM: # define POSH_CPU_SPARC 1 #endif -#if defined ARM || defined __arm__ || defined _ARM +#if defined ARM || defined __arm__ || defined _ARM || defined _M_ARM # define POSH_CPU_STRONGARM 1 # define POSH_CPU_STRING "ARM" #endif -#if defined __aarch64__ +#if defined __aarch64__ || defined _M_ARM64 # define POSH_CPU_AARCH64 1 # define POSH_CPU_STRING "ARM64" #endif