mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Try to fix compilation on MSVC

Browse Source
This commit is contained in:
Michael Steenbeek
2017-12-13 13:42:14 +01:00
parent 4a9ef5bd12
commit 90446d06ed
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,6 +183,7 @@ sint32 bitscanforward(sint32 source)
#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
@@ -195,7 +196,7 @@ static bool cpuid_x86(uint32 * cpuid_outdata, sint32 eax)
int ret = __get_cpuid(eax, &cpuid_outdata[0], &cpuid_outdata[1], &cpuid_outdata[2], &cpuid_outdata[3]);
return ret == 1;
#elif defined(OpenRCT2_CPUID_MSVC_X86)
__cpuid(cpuid_outdata, eax);
__cpuid((int *)cpuid_outdata, (int)eax);
return true;
#else
return false;