mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Move definition of OPENRCT2_X86 macro

Browse Source
This commit is contained in:
Michał Janiszewski
2017-12-30 00:09:17 +01:00
parent ab716f60b2
commit 1fdc8ef49e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/common.h
View File

@@ -203,6 +203,12 @@ typedef uint16 rct_string_id;
#endif
#define abstract = 0
#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
#define OPENRCT2_X86
#elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008
#define OPENRCT2_X86
#endif
#if defined(__i386__) || defined(_M_IX86)
#define PLATFORM_X86
#endif

2
src/openrct2/util/Util.cpp
View File

@@ -181,12 +181,10 @@ sint32 bitscanforward(sint32 source)
#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
#include <cpuid.h>
#define OpenRCT2_CPUID_GNUC_X86
#define OPENRCT2_X86
#elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008
#include <intrin.h>
#include <nmmintrin.h>
#define OpenRCT2_CPUID_MSVC_X86
#define OPENRCT2_X86
#endif
#ifdef OPENRCT2_X86