ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gs-merge: make sure x11 defines are scoped

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-05-12 10:21:44 +02:00 committed by Kojin
parent fef8dfd05b
commit 3851014634
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcsx2/GS/GS.cpp
View File

@ -37,7 +37,6 @@
#include "Window/GSWndWGL.h" #include "Window/GSWndWGL.h"
#include "Window/GSSettingsDlg.h" #include "Window/GSSettingsDlg.h"
#undef None
static HRESULT s_hr = E_FAIL; static HRESULT s_hr = E_FAIL;
@ -54,10 +53,10 @@ extern bool RunLinuxDialog();
#endif #endif
#define PS2E_LT_GS 0x01 // do NOT undefine this/put it above includes, as x11 people love to redefine
#define PS2E_GS_VERSION 0x0006 // things that make obscure compiler bugs, unless you want to run around and
#define PS2E_X86 0x01 // 32 bit // debug obscure compiler errors --govanify
#define PS2E_X86_64 0x02 // 64 bit #undef None
static GSRenderer* s_gs = NULL; static GSRenderer* s_gs = NULL;
static void (*s_irq)() = NULL; static void (*s_irq)() = NULL;
@ -67,19 +66,6 @@ static bool s_exclusive = true;
static std::string s_renderer_name; static std::string s_renderer_name;
bool gsopen_done = false; // crash guard for GSgetTitleInfo2 and GSKeyEvent (replace with lock?) bool gsopen_done = false; // crash guard for GSgetTitleInfo2 and GSKeyEvent (replace with lock?)
uint32 PS2EgetCpuPlatform()
{
#ifdef _M_AMD64
return PS2E_X86_64;
#else
return PS2E_X86;
#endif
}
void GSsetBaseMem(uint8* mem) void GSsetBaseMem(uint8* mem)
{ {
s_basemem = mem; s_basemem = mem;