From f722c51850a6eac6f61c0276d9ff651c915a96b0 Mon Sep 17 00:00:00 2001
From: Ilya Shurumov <ishurumov@gmail.com>
Date: Mon, 10 May 2021 02:38:12 +0600
Subject: [PATCH] - [Psy-X] move headers to psx folder

---
 src_rebuild/PsyX/include/PsyX/PsyX_render.h   | 7 ++++---
 src_rebuild/PsyX/include/{ => psx}/abs.h      | 0
 src_rebuild/PsyX/include/{ => psx}/asm.h      | 0
 src_rebuild/PsyX/include/{ => psx}/gtemac.h   | 0
 src_rebuild/PsyX/include/{ => psx}/gtereg.h   | 0
 src_rebuild/PsyX/include/{ => psx}/inline_c.h | 0
 src_rebuild/PsyX/include/{ => psx}/kernel.h   | 0
 src_rebuild/PsyX/include/{ => psx}/libapi.h   | 0
 src_rebuild/PsyX/include/{ => psx}/libcd.h    | 0
 src_rebuild/PsyX/include/{ => psx}/libetc.h   | 0
 src_rebuild/PsyX/include/{ => psx}/libgpu.h   | 0
 src_rebuild/PsyX/include/{ => psx}/libgte.h   | 0
 src_rebuild/PsyX/include/{ => psx}/libmath.h  | 0
 src_rebuild/PsyX/include/{ => psx}/libmcrd.h  | 0
 src_rebuild/PsyX/include/{ => psx}/libpad.h   | 0
 src_rebuild/PsyX/include/{ => psx}/libpress.h | 0
 src_rebuild/PsyX/include/{ => psx}/libsn.h    | 0
 src_rebuild/PsyX/include/{ => psx}/libspu.h   | 0
 src_rebuild/PsyX/include/{ => psx}/r3000.h    | 0
 src_rebuild/PsyX/include/{ => psx}/rand.h     | 0
 src_rebuild/PsyX/include/psx/strings.h        | 7 +++++++
 src_rebuild/PsyX/include/{ => psx}/types.h    | 0
 src_rebuild/PsyX/include/strings.h            | 7 -------
 src_rebuild/PsyX/src/PsyX_main.c              | 8 +++++---
 src_rebuild/PsyX/src/gpu/PsyX_GPU.h           | 7 ++++---
 src_rebuild/PsyX/src/psx/LIBGPU.C             | 7 +++----
 src_rebuild/PsyX/src/psx/LIBGTE.C             | 9 ++++-----
 src_rebuild/PsyX/src/psx/LIBSPU.C             | 8 ++++----
 src_rebuild/premake5.lua                      | 3 ++-
 29 files changed, 33 insertions(+), 30 deletions(-)
 rename src_rebuild/PsyX/include/{ => psx}/abs.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/asm.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/gtemac.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/gtereg.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/inline_c.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/kernel.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libapi.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libcd.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libetc.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libgpu.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libgte.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libmath.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libmcrd.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libpad.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libpress.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libsn.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/libspu.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/r3000.h (100%)
 rename src_rebuild/PsyX/include/{ => psx}/rand.h (100%)
 create mode 100644 src_rebuild/PsyX/include/psx/strings.h
 rename src_rebuild/PsyX/include/{ => psx}/types.h (100%)
 delete mode 100644 src_rebuild/PsyX/include/strings.h

diff --git a/src_rebuild/PsyX/include/PsyX/PsyX_render.h b/src_rebuild/PsyX/include/PsyX/PsyX_render.h
index b36ddac1..2e52f687 100644
--- a/src_rebuild/PsyX/include/PsyX/PsyX_render.h
+++ b/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>
diff --git a/src_rebuild/PsyX/include/abs.h b/src_rebuild/PsyX/include/psx/abs.h
similarity index 100%
rename from src_rebuild/PsyX/include/abs.h
rename to src_rebuild/PsyX/include/psx/abs.h
diff --git a/src_rebuild/PsyX/include/asm.h b/src_rebuild/PsyX/include/psx/asm.h
similarity index 100%
rename from src_rebuild/PsyX/include/asm.h
rename to src_rebuild/PsyX/include/psx/asm.h
diff --git a/src_rebuild/PsyX/include/gtemac.h b/src_rebuild/PsyX/include/psx/gtemac.h
similarity index 100%
rename from src_rebuild/PsyX/include/gtemac.h
rename to src_rebuild/PsyX/include/psx/gtemac.h
diff --git a/src_rebuild/PsyX/include/gtereg.h b/src_rebuild/PsyX/include/psx/gtereg.h
similarity index 100%
rename from src_rebuild/PsyX/include/gtereg.h
rename to src_rebuild/PsyX/include/psx/gtereg.h
diff --git a/src_rebuild/PsyX/include/inline_c.h b/src_rebuild/PsyX/include/psx/inline_c.h
similarity index 100%
rename from src_rebuild/PsyX/include/inline_c.h
rename to src_rebuild/PsyX/include/psx/inline_c.h
diff --git a/src_rebuild/PsyX/include/kernel.h b/src_rebuild/PsyX/include/psx/kernel.h
similarity index 100%
rename from src_rebuild/PsyX/include/kernel.h
rename to src_rebuild/PsyX/include/psx/kernel.h
diff --git a/src_rebuild/PsyX/include/libapi.h b/src_rebuild/PsyX/include/psx/libapi.h
similarity index 100%
rename from src_rebuild/PsyX/include/libapi.h
rename to src_rebuild/PsyX/include/psx/libapi.h
diff --git a/src_rebuild/PsyX/include/libcd.h b/src_rebuild/PsyX/include/psx/libcd.h
similarity index 100%
rename from src_rebuild/PsyX/include/libcd.h
rename to src_rebuild/PsyX/include/psx/libcd.h
diff --git a/src_rebuild/PsyX/include/libetc.h b/src_rebuild/PsyX/include/psx/libetc.h
similarity index 100%
rename from src_rebuild/PsyX/include/libetc.h
rename to src_rebuild/PsyX/include/psx/libetc.h
diff --git a/src_rebuild/PsyX/include/libgpu.h b/src_rebuild/PsyX/include/psx/libgpu.h
similarity index 100%
rename from src_rebuild/PsyX/include/libgpu.h
rename to src_rebuild/PsyX/include/psx/libgpu.h
diff --git a/src_rebuild/PsyX/include/libgte.h b/src_rebuild/PsyX/include/psx/libgte.h
similarity index 100%
rename from src_rebuild/PsyX/include/libgte.h
rename to src_rebuild/PsyX/include/psx/libgte.h
diff --git a/src_rebuild/PsyX/include/libmath.h b/src_rebuild/PsyX/include/psx/libmath.h
similarity index 100%
rename from src_rebuild/PsyX/include/libmath.h
rename to src_rebuild/PsyX/include/psx/libmath.h
diff --git a/src_rebuild/PsyX/include/libmcrd.h b/src_rebuild/PsyX/include/psx/libmcrd.h
similarity index 100%
rename from src_rebuild/PsyX/include/libmcrd.h
rename to src_rebuild/PsyX/include/psx/libmcrd.h
diff --git a/src_rebuild/PsyX/include/libpad.h b/src_rebuild/PsyX/include/psx/libpad.h
similarity index 100%
rename from src_rebuild/PsyX/include/libpad.h
rename to src_rebuild/PsyX/include/psx/libpad.h
diff --git a/src_rebuild/PsyX/include/libpress.h b/src_rebuild/PsyX/include/psx/libpress.h
similarity index 100%
rename from src_rebuild/PsyX/include/libpress.h
rename to src_rebuild/PsyX/include/psx/libpress.h
diff --git a/src_rebuild/PsyX/include/libsn.h b/src_rebuild/PsyX/include/psx/libsn.h
similarity index 100%
rename from src_rebuild/PsyX/include/libsn.h
rename to src_rebuild/PsyX/include/psx/libsn.h
diff --git a/src_rebuild/PsyX/include/libspu.h b/src_rebuild/PsyX/include/psx/libspu.h
similarity index 100%
rename from src_rebuild/PsyX/include/libspu.h
rename to src_rebuild/PsyX/include/psx/libspu.h
diff --git a/src_rebuild/PsyX/include/r3000.h b/src_rebuild/PsyX/include/psx/r3000.h
similarity index 100%
rename from src_rebuild/PsyX/include/r3000.h
rename to src_rebuild/PsyX/include/psx/r3000.h
diff --git a/src_rebuild/PsyX/include/rand.h b/src_rebuild/PsyX/include/psx/rand.h
similarity index 100%
rename from src_rebuild/PsyX/include/rand.h
rename to src_rebuild/PsyX/include/psx/rand.h
diff --git a/src_rebuild/PsyX/include/psx/strings.h b/src_rebuild/PsyX/include/psx/strings.h
new file mode 100644
index 00000000..96288324
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/src_rebuild/PsyX/include/types.h b/src_rebuild/PsyX/include/psx/types.h
similarity index 100%
rename from src_rebuild/PsyX/include/types.h
rename to src_rebuild/PsyX/include/psx/types.h
diff --git a/src_rebuild/PsyX/include/strings.h b/src_rebuild/PsyX/include/strings.h
deleted file mode 100644
index 3513803e..00000000
--- a/src_rebuild/PsyX/include/strings.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef STRINGS_H
-#define STRINGS_H
-
-#include <string.h>//temp
-#include <ctype.h>//temp
-
-#endif
\ No newline at end of file
diff --git a/src_rebuild/PsyX/src/PsyX_main.c b/src_rebuild/PsyX/src/PsyX_main.c
index 06c8f392..ad6150ba 100644
--- a/src_rebuild/PsyX/src/PsyX_main.c
+++ b/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;
diff --git a/src_rebuild/PsyX/src/gpu/PsyX_GPU.h b/src_rebuild/PsyX/src/gpu/PsyX_GPU.h
index dc176cf4..d57cade2 100644
--- a/src_rebuild/PsyX/src/gpu/PsyX_GPU.h
+++ b/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
diff --git a/src_rebuild/PsyX/src/psx/LIBGPU.C b/src_rebuild/PsyX/src/psx/LIBGPU.C
index 912d9322..df59655a 100644
--- a/src_rebuild/PsyX/src/psx/LIBGPU.C
+++ b/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>
diff --git a/src_rebuild/PsyX/src/psx/LIBGTE.C b/src_rebuild/PsyX/src/psx/LIBGTE.C
index ed527380..3aad296e 100644
--- a/src_rebuild/PsyX/src/psx/LIBGTE.C
+++ b/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"
diff --git a/src_rebuild/PsyX/src/psx/LIBSPU.C b/src_rebuild/PsyX/src/psx/LIBSPU.C
index 6e8e8a95..fd7aad21 100644
--- a/src_rebuild/PsyX/src/psx/LIBSPU.C
+++ b/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>
 
diff --git a/src_rebuild/premake5.lua b/src_rebuild/premake5.lua
index d7449119..61dae081 100644
--- a/src_rebuild/premake5.lua
+++ b/src_rebuild/premake5.lua
@@ -120,7 +120,8 @@ project "REDRIVER2"
         links { "Psy-X", "jpeg" }
 		
 		includedirs { 
-			"PsyX/include"
+			"PsyX/include",
+			"PsyX/include/psx"
 		}
 		
 		files {