- [Psy-X] move some declarations to resolve conflicts

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;

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);

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"
 

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"