- [Psy-X] move headers to psx folder

src_rebuild/PsyX/include/PsyX/PsyX_render.h

@@ -62,11 +62,12 @@
 #   define TEXTURE_FORMAT GL_UNSIGNED_SHORT_5_5_5_1
 #endif
 
-#include "types.h"
+#include "psx/types.h"
 
 #include "common/pgxp_defs.h"
-#include "libgte.h"
-#include "libgpu.h"
+
+#include "psx/libgte.h"
+#include "psx/libgpu.h"
 
 #include <stdio.h>
 #include <stddef.h>

src_rebuild/PsyX/include/psx/strings.h

@@ -0,0 +1,7 @@
+#ifndef STRINGS_H
+#define STRINGS_H
+
+#include <string.h>	// temp
+#include <ctype.h>	// temp
+
+#endif

src_rebuild/PsyX/include/strings.h

@@ -1,7 +0,0 @@
-#ifndef STRINGS_H
-#define STRINGS_H
-
-#include <string.h>//temp
-#include <ctype.h>//temp
-
-#endif

src_rebuild/PsyX/src/PsyX_main.c

@@ -6,9 +6,9 @@
 #include "PsyX/util/timer.h"
 #include "util/crash_handler.h"
 
-#include "libetc.h"
-#include "libgte.h"
-#include "libgpu.h"
+#include "psx/libetc.h"
+#include "psx/libgte.h"
+#include "psx/libgpu.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -28,6 +28,8 @@ int strcasecmp(const char* _l, const char* _r)
 	for (; *l && *r && (*l == *r || tolower(*l) == tolower(*r)); l++, r++);
 	return tolower(*l) - tolower(*r);
 }
+#elif !defined(WIN32)
+#include <strings.h>
 #endif
 
 SDL_Window* g_window = NULL;

src_rebuild/PsyX/src/gpu/PsyX_GPU.h

@@ -1,9 +1,10 @@
 #ifndef PSYX_GPU_H
 #define PSYX_GPU_H
 
-#include "libgte.h"
-#include "libgpu.h"
-#include "types.h"
+#include "psx/libgte.h"
+#include "psx/libgpu.h"
+#include "psx/types.h"
+
 #include "PsyX/common/pgxp_defs.h"
 
 extern OT_TAG prim_terminator; // P_TAG with zero length

src_rebuild/PsyX/src/psx/LIBGPU.C

@@ -1,5 +1,6 @@
-#include "libgte.h"
-#include "libgpu.h"
+#include "psx/libgte.h"
+#include "psx/libgpu.h"
+#include "psx/libetc.h"
 
 #include "../gpu/PsyX_GPU.h"
 #include "PsyX/PsyX_render.h"
@@ -7,8 +8,6 @@
 
 #include <stdint.h>
 
-#include "libetc.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src_rebuild/PsyX/src/psx/LIBGTE.C

@@ -1,14 +1,13 @@
-#include "libgte.h"
+#include "psx/libgte.h"
+#include "psx/inline_c.h"
+#include "psx/gtemac.h"
+#include "psx/gtereg.h"
 
 #include <stdio.h>
 #include "PsyX/PsyX_render.h"
 
 #include <assert.h>
 
-#include "inline_c.h"
-#include "gtemac.h"
-#include "gtereg.h"
-
 #include "../gte/PsyX_GTE.h"
 #include "../gte/rcossin_tbl.h"
 #include "../gte/ratan_tbl.h"

src_rebuild/PsyX/src/psx/LIBSPU.C

@@ -1,12 +1,12 @@
 #define HAVE_M_PI
 
-#include "libspu.h"
-#include "libetc.h"
+#include "psx/libspu.h"
+#include "psx/libetc.h"
+#include "psx/libmath.h"
+
 #include <stdio.h>
 
 #include "../PsyX_setup.h"
-#include "libmath.h"
-
 
 #include <string.h>
 

src_rebuild/premake5.lua

@@ -120,7 +120,8 @@ project "REDRIVER2"
         links { "Psy-X", "jpeg" }
 		
 		includedirs { 
-			"PsyX/include"
+			"PsyX/include",
+			"PsyX/include/psx"
 		}
 		
 		files {