From ddbeebb887cff61b087a48738650832bc62c9e83 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 21 Jul 2015 20:08:49 -0400 Subject: Common: Ported over boilerplate x86 JIT code from Dolphin/PPSSPP. --- src/common/platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/platform.h') diff --git a/src/common/platform.h b/src/common/platform.h index 0a912dda3..08aaa03a4 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// // Platform detection -#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) +#if defined(__x86_64__) || defined(_M_X86_64) || defined(__aarch64__) #define EMU_ARCH_BITS 64 #elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) #define EMU_ARCH_BITS 32 -- cgit v1.2.3 From bd7e691f78d916ed6ae5396b2d646d9b3a053dd7 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 12 Aug 2015 00:00:44 -0400 Subject: x64: Refactor to remove fake interfaces and general cleanups. --- src/common/platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/platform.h') diff --git a/src/common/platform.h b/src/common/platform.h index 08aaa03a4..118a9ed3b 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// // Platform detection -#if defined(__x86_64__) || defined(_M_X86_64) || defined(__aarch64__) +#if defined(__x86_64__) || defined(ARCHITECTURE_X64) || defined(__aarch64__) #define EMU_ARCH_BITS 64 #elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) #define EMU_ARCH_BITS 32 -- cgit v1.2.3 From b39c053785abc4a94ce380885a846c5d8be89675 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 14 Aug 2015 22:29:08 -0400 Subject: Rename ARCHITECTURE_X64 definition to ARCHITECTURE_x86_64. --- src/common/platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/platform.h') diff --git a/src/common/platform.h b/src/common/platform.h index 118a9ed3b..9ba4db11b 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// // Platform detection -#if defined(__x86_64__) || defined(ARCHITECTURE_X64) || defined(__aarch64__) +#if defined(ARCHITECTURE_x86_64) || defined(__aarch64__) #define EMU_ARCH_BITS 64 #elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) #define EMU_ARCH_BITS 32 -- cgit v1.2.3