From 563772fdf160055514195a8287a243bceff34a5f Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 16 Jun 2019 17:33:17 -0700 Subject: [PATCH] Added a universal 64-bit define, and a message indicating that Pcsx2 was compiled as 64 bit in the system information. --- common/include/Pcsx2Defs.h | 4 ++++ pcsx2/System.cpp | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common/include/Pcsx2Defs.h b/common/include/Pcsx2Defs.h index e941b0ae20..02a931a464 100644 --- a/common/include/Pcsx2Defs.h +++ b/common/include/Pcsx2Defs.h @@ -241,3 +241,7 @@ static const int __pagesize = PCSX2_PAGESIZE; #define __fc __fastcall #endif + +#if defined(__x86_64__) || defined(_M_AMD64) +#define __M_X86_64 +#endif diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index d79c945c00..7a950a0205 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -262,7 +262,11 @@ void SysLogMachineCaps() }; Console.WriteLn( Color_StrongBlack, L"x86 Features Detected:" ); - Console.Indent().WriteLn( result[0] + (result[1].IsEmpty() ? L"" : (L"\n" + result[1])) ); + Console.Indent().WriteLn(result[0] + (result[1].IsEmpty() ? L"" : (L"\n" + result[1]))); +#ifdef __M_X86_64 + Console.Indent().WriteLn("Pcsx2 was compiled as 64-bits, which is unsupported and breaks all recompilers."); +#endif + Console.Newline(); }