From 1ef19ddb70eab16e8b8705bf50d0e83fae3ee5e8 Mon Sep 17 00:00:00 2001
From: Ilya Shurumov <ishurumov@gmail.com>
Date: Fri, 30 Apr 2021 02:08:48 +0600
Subject: [PATCH] - [Psy-X] move some declarations to resolve conflicts

---
 src_rebuild/PsyX/include/PSYX_GLOBALS.H | 5 -----
 src_rebuild/PsyX/include/PSYX_RENDER.H  | 5 ++++-
 src_rebuild/PsyX/src/GPU/PsyX_GPU.C     | 1 +
 src_rebuild/PsyX/src/PSYX.C             | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src_rebuild/PsyX/include/PSYX_GLOBALS.H b/src_rebuild/PsyX/include/PSYX_GLOBALS.H
index 1c70ae3d..4d1890fa 100644
--- a/src_rebuild/PsyX/include/PSYX_GLOBALS.H
+++ b/src_rebuild/PsyX/include/PSYX_GLOBALS.H
@@ -1,11 +1,6 @@
 #ifndef EMULATOR_GLOBALS_H
 #define EMULATOR_GLOBALS_H
 
-#include "PSYX_RENDER.H"
-
-extern TextureID        g_whiteTexture;
-extern TextureID        g_vramTexture;
-
 extern int g_windowWidth;
 extern int g_windowHeight;
 extern int g_wireframeMode;
diff --git a/src_rebuild/PsyX/include/PSYX_RENDER.H b/src_rebuild/PsyX/include/PSYX_RENDER.H
index c6004d0d..8853dd00 100644
--- a/src_rebuild/PsyX/include/PSYX_RENDER.H
+++ b/src_rebuild/PsyX/include/PSYX_RENDER.H
@@ -152,7 +152,10 @@ typedef uint ShaderID;
 #error
 #endif
 
-extern void GR_SwapWindow();
+extern TextureID	g_whiteTexture;
+extern TextureID	g_vramTexture;
+
+extern void			GR_SwapWindow();
 
 // PSX VRAM operations
 extern void			GR_SaveVRAM(const char* outputFileName, int x, int y, int width, int height, int bReadFromFrameBuffer);
diff --git a/src_rebuild/PsyX/src/GPU/PsyX_GPU.C b/src_rebuild/PsyX/src/GPU/PsyX_GPU.C
index f6873f88..fb6dd08e 100644
--- a/src_rebuild/PsyX/src/GPU/PsyX_GPU.C
+++ b/src_rebuild/PsyX/src/GPU/PsyX_GPU.C
@@ -2,6 +2,7 @@
 
 #include "PSYX_PUBLIC.H"
 #include "PSYX_GLOBALS.H"
+#include "PSYX_RENDER.H"
 
 #include "../PSYX_SETUP.H"
 
diff --git a/src_rebuild/PsyX/src/PSYX.C b/src_rebuild/PsyX/src/PSYX.C
index f575439d..03debed8 100644
--- a/src_rebuild/PsyX/src/PSYX.C
+++ b/src_rebuild/PsyX/src/PSYX.C
@@ -7,6 +7,7 @@
 #include "UTIL/CRASHHANDLER.H"
 
 #include "LIBETC.H"
+#include "LIBGTE.H"
 #include "LIBGPU.H"
 
 #include "UTIL/TIMER.H"