GS: Don't include xbyak into everything

Xbyak header is massive
PCSX2 · Jul 3, 2021 · 63645de · 63645de
1 parent 2849f0b
commit 63645de
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pcsx2/GS/GSUtil.h b/pcsx2/GS/GSUtil.h
@@ -17,6 +17,8 @@
 
 #include "GS.h"
 
+#include <xbyak/xbyak_util.h>
+
 class GSUtil
 {
 public:

diff --git a/pcsx2/GS/GS_types.h b/pcsx2/GS/GS_types.h
@@ -25,10 +25,9 @@ typedef unsigned long long uint64;
 typedef signed long long int64;
 typedef signed long long sint64;
 
+// Makes sure that if anyone includes xbyak, it doesn't do anything bad
 #define MIE_INTEGER_TYPE_DEFINED
 #define XBYAK_ENABLE_OMITTED_OPERAND
-#include <xbyak/xbyak.h>
-#include <xbyak/xbyak_util.h>
 
 #include <cfloat>
 

diff --git a/pcsx2/GS/Renderers/Common/GSFunctionMap.h b/pcsx2/GS/Renderers/Common/GSFunctionMap.h
@@ -20,6 +20,8 @@
 
 #include "GS/Renderers/SW/GSScanlineEnvironment.h"
 
+#include <xbyak/xbyak_util.h>
+
 template <class KEY, class VALUE>
 class GSFunctionMap
 {