Reorganize library code into libs/ (#3119)

* Reorganize files into libs/{dolphin,JSystem,PowerPC_EABI_Support,revolution,TRK_MINNOW_DOLPHIN}

* Update configure.py and project.py for new libs structure

* Refactor `#include <dolphin/x.h>` -> `<x.h>`

* Remove `__REVOLUTION_SDK__` forwards from dolphin

* Fix dolphin/ references in revolution

* Wrap `#include <dolphin.h>` in `!__REVOLUTION_SDK__`

* Always build TRK against dolphin headers

* Resolve revolution SDK header resolution issues

configure.py

@@ -272,21 +272,29 @@ cflags_base = [
     f"-i build/{config.version}/include",
     f"-i assets/{config.version}",
     "-i src",
-    "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include",
-    "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include",
-    "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include",
-    "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include",
-    "-i src/PowerPC_EABI_Support/Runtime/Inc",
-    "-i src/PowerPC_EABI_Support/MetroTRK",
-    "-i include/dolphin",
+    "-i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include",
+    "-i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include",
+    "-i libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include",
+    "-i libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include",
+    "-i libs/PowerPC_EABI_Support/Runtime/Inc",
+    "-i libs/PowerPC_EABI_Support/MetroTRK",
+    "-i libs/JSystem/include",
     f"-DVERSION={version_num}",
     "-D__GEKKO__",
 ]
 
 if config.version in WII_VERSIONS or config.version in SHIELD_VERSIONS:
-    cflags_base.extend(["-enc SJIS"])
+    cflags_base.extend([
+        "-i libs/revolution/include",
+        "-i libs/revolution/include/revolution",  # for types.h includes
+        "-enc SJIS",
+    ])
 else:
-    cflags_base.extend(["-multibyte"])
+    cflags_base.extend([
+        "-i libs/dolphin/include",
+        "-i libs/dolphin/include/dolphin",  # for types.h includes
+        "-multibyte",
+    ])
 
 USE_REVOLUTION_SDK_VERSIONS = [
     "RZDE01_00", # Wii USA Rev 0
@@ -351,7 +359,7 @@ cflags_trk = [
 # Dolphin library flags
 cflags_dolphin = [
     *cflags_base,
-    "-ir src/dolphin",
+    "-ir libs/dolphin/src",
     "-fp_contract off",
     "-char unsigned",
     "-sym on",
@@ -361,12 +369,11 @@ cflags_dolphin = [
 # Revolution library flags
 cflags_revolution_base = [
     *cflags_base,
-    "-ir src/revolution",
+    "-ir libs/revolution/src",
     "-fp_contract off",
     "-sym on",
     "-inline auto",
     "-ipa file",
-    "-i include/revolution",
     "-D__REVOLUTION_SDK__",
 ]
 
@@ -466,6 +473,8 @@ else:
 def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
     return {
         "lib": lib_name,
+        "src_dir": "libs/dolphin/src",
+        "strip_prefix": "dolphin/",
         "mw_version": "GC/1.2.5n",
         "cflags": cflags_dolphin,
         "progress_category": "sdk",
@@ -476,6 +485,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict
     if config.version == "ShieldD":
         return {
             "lib": lib_name,
+            "src_dir": "libs/revolution/src",
+            "strip_prefix": "revolution/",
             "mw_version": "Wii/1.0",
             "cflags": [*cflags_revolution_debug, "-DSDK_AUG2010", *extra_cflags],
             "progress_category": "sdk",
@@ -484,6 +495,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict
     elif config.version == "Shield":
         return {
             "lib": lib_name,
+            "src_dir": "libs/revolution/src",
+            "strip_prefix": "revolution/",
             "mw_version": "Wii/1.0",
             "cflags": [*cflags_revolution_retail, "-DSDK_AUG2010", *extra_cflags],
             "progress_category": "sdk",
@@ -492,6 +505,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict
     elif config.version == "RZDE01_00":
         return {
             "lib": lib_name,
+            "src_dir": "libs/revolution/src",
+            "strip_prefix": "revolution/",
             "mw_version": "GC/3.0a3",
             "cflags": [*cflags_revolution_retail, "-DSDK_SEP2006", "-DNW4HBM_DEBUG", *extra_cflags],
             "progress_category": "sdk",
@@ -500,6 +515,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict
     else:
         return {
             "lib": lib_name,
+            "src_dir": "libs/revolution/src",
+            "strip_prefix": "revolution/",
             "mw_version": "GC/3.0a3",
             "cflags": [*cflags_revolution_retail, "-DSDK_SEP2006", *extra_cflags],
             "progress_category": "sdk",
@@ -525,6 +542,8 @@ def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[st
 def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="third_party") -> Dict[str, Any]:
     return {
         "lib": lib_name,
+        "src_dir": "libs/JSystem/src",
+        "strip_prefix": "JSystem/",
         "mw_version": MWVersion(config.version),
         "cflags": [*cflags_jsystem],
         "progress_category": progress_category,
@@ -560,17 +579,20 @@ config.warn_missing_config = True
 config.warn_missing_source = False
 config.precompiled_headers = [
     {
-        "source": "d/dolzel.pch",
+        "source": "include/d/dolzel.pch",
+        "output": "d/dolzel.mch",
         "mw_version": MWVersion(config.version),
         "cflags": ["-lang=c++", *cflags_dolzel_framework],
     },
     {
-        "source": "d/dolzel_rel.pch",
+        "source": "include/d/dolzel_rel.pch",
+        "output": "d/dolzel_rel.mch",
         "mw_version": MWVersion(config.version),
         "cflags": ["-lang=c++", *cflags_dolzel_rel],
     },
     {
-        "source": "JSystem/JSystem.pch",
+        "source": "libs/JSystem/include/JSystem/JSystem.pch",
+        "output": "JSystem/JSystem.mch",
         "mw_version": MWVersion(config.version),
         "cflags": ["-lang=c++", *cflags_framework],
     },
@@ -581,7 +603,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "core",
-        "host": True,
         "objects": [
             Object(MatchingFor(ALL_GCN), "m_Do/m_Do_main.cpp"),
             Object(MatchingFor(ALL_GCN), "m_Do/m_Do_printf.cpp"),
@@ -608,7 +629,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "game",
-        "host": True,
         "objects": [
             Object(MatchingFor(ALL_GCN), "c/c_damagereaction.cpp"),
             Object(MatchingFor(ALL_GCN), "c/c_dylink.cpp"),
@@ -619,7 +639,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "core",
-        "host": True,
         "objects": [
             # f_ap
             Object(MatchingFor(ALL_GCN), "f_ap/f_ap_game.cpp"),
@@ -688,7 +707,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "game",
-        "host": True,
         "objects": [
             Object(NonMatching, "d/d_home_button.cpp"),
             Object(NonMatching, "d/d_cursor_mng.cpp"),
@@ -876,7 +894,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "core",
-        "host": True,
         "objects": [
             Object(MatchingFor(ALL_GCN), "DynamicLink.cpp"),
         ],
@@ -886,7 +903,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "core",
-        "host": True,
         "objects": [
             Object(NonMatching, "CaptureScreen.cpp"),
         ],
@@ -896,7 +912,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "third_party",
-        "host": True,
         "objects": [
             Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_malloc.cpp"),
             Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API.cpp"),
@@ -1221,7 +1236,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "core",
-        "host": True,
         "objects": [
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Calc.cpp"),
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2AudioArcLoader.cpp"),
@@ -1257,7 +1271,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "core",
-        "host": True,
         "objects": [
             Object(Matching, "Z2AudioCS/SpkSpeakerCtrl.cpp"),
             Object(Equivalent, "Z2AudioCS/SpkSystem.cpp"),
@@ -1271,6 +1284,8 @@ config.libs = [
     },
     {
         "lib": "gf",
+        "src_dir": "libs/dolphin/src",
+        "strip_prefix": "dolphin/",
         "mw_version": MWVersion(config.version),
         "cflags": [*cflags_noopt, "-O3"],
         "progress_category": "sdk",
@@ -1503,8 +1518,10 @@ config.libs = [
     ),
     {
         "lib": "exi",
+        "src_dir": "libs/dolphin/src",
+        "strip_prefix": "dolphin/",
         "mw_version": "GC/1.2.5n",
-        "cflags": [*cflags_noopt, "-ir src/dolphin"],
+        "cflags": [*cflags_noopt, "-ir libs/dolphin/src"],
         "progress_category": "sdk",
         "objects": [
             Object(Matching, "dolphin/exi/EXIBios.c", extra_cflags=["-O3,p"]),
@@ -1976,10 +1993,10 @@ config.libs = [
     ),
     {
         "lib": "Runtime.PPCEABI.H",
+        "src_dir": "libs",
         "mw_version": MWVersion(config.version),
         "cflags": cflags_runtime,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/Runtime/Src/__mem.c"),
             Object(MatchingFor(ALL_GCN, "Shield"), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c"),
@@ -1995,10 +2012,10 @@ config.libs = [
     },
     {
         "lib": "MSL_C",
+        "src_dir": "libs",
         "mw_version": MWVersion(config.version),
         "cflags": cflags_runtime,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c"),
             Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c"),
@@ -2076,10 +2093,10 @@ config.libs = [
     },
     {
         "lib": "TRK_MINNOW_DOLPHIN",
+        "src_dir": "libs",
         "mw_version": MWVersion(config.version),
         "cflags": cflags_trk,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             # debugger
             Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c"),
@@ -2123,7 +2140,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_dolphin,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             Object(MatchingFor(ALL_GCN), "amcstubs/AmcExi2Stubs.c"),
         ],
@@ -2133,7 +2149,6 @@ config.libs = [
         "mw_version": "GC/1.2.5n",
         "cflags": cflags_runtime,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             Object(MatchingFor(ALL_GCN), "odemuexi2/DebuggerDriver.c"),
         ],
@@ -2143,7 +2158,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_dolphin,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             Object(MatchingFor(ALL_GCN), "odenotstub/odenotstub.c"),
         ],
@@ -2154,7 +2168,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             Object(NonMatching, "NdevExi2A/DebuggerDriver.c"),
             Object(NonMatching, "NdevExi2A/exi2.c"),
@@ -2165,7 +2178,6 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_framework,
         "progress_category": "third_party",
-        "host": False,
         "objects": [
             Object(MatchingFor("Shield"), "lingcod/LingcodPatch.c"),
         ],
@@ -2177,13 +2189,13 @@ config.libs = [
         "mw_version": MWVersion(config.version),
         "cflags": cflags_rel,
         "progress_category": "sdk",
-        "host": False,
         "objects": [
             Object(MatchingFor(ALL_GCN), "REL/executor.c"),
             Object(
                 MatchingFor(ALL_GCN),
                 "REL/global_destructor_chain.c",
-                source="PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c",
+                src_dir="libs/PowerPC_EABI_Support/Runtime/Src",
+                source="global_destructor_chain.c",
             ),
         ],
     },

include/DynamicLink.h

@@ -1,7 +1,7 @@
 #ifndef DYNAMICLINK_H
 #define DYNAMICLINK_H
 
-#include <dolphin/os.h>
+#include <os.h>
 #include "JSystem/JKernel/JKRHeap.h"
 #include "global.h"
 

include/NdevExi2A/DebuggerDriver.h

@@ -1,7 +1,7 @@
 #ifndef NDEVEXI2A_DEBUGGERDRIVER_H
 #define NDEVEXI2A_DEBUGGERDRIVER_H
 
-#include <dolphin/os.h>
+#include <os.h>
 #include "types.h"
 
 typedef void (*MtrCallback)(s32, OSContext*);

include/SSystem/SComponent/c_API_controller_pad.h

@@ -1,7 +1,7 @@
 #ifndef C_API_CONTROLLER_PAD_
 #define C_API_CONTROLLER_PAD_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct interface_of_controller_pad {
     /* 0x00 */ f32 mMainStickPosX;

include/SSystem/SComponent/c_bg_s_chk.h

@@ -1,7 +1,7 @@
 #ifndef C_BG_S_CHK_H
 #define C_BG_S_CHK_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include "f_pc/f_pc_base.h"
 #include "SSystem/SComponent/c_bg_s_grp_pass_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_pass_chk.h"

include/SSystem/SComponent/c_bg_s_poly_info.h

@@ -1,7 +1,7 @@
 #ifndef C_BG_S_POLY_INFO_H
 #define C_BG_S_POLY_INFO_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_pc/f_pc_manager.h"
 
 class cBgS_PolyInfo {

include/SSystem/SComponent/c_bg_w.h

@@ -1,7 +1,7 @@
 #ifndef C_BG_W_H
 #define C_BG_W_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class cBgW_BgId {
 private:

include/SSystem/SComponent/c_counter.h

@@ -1,7 +1,7 @@
 #ifndef C_COUNTER_H
 #define C_COUNTER_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct counter_class {
     u32 mCounter0;

include/SSystem/SComponent/c_lib.h

@@ -2,7 +2,7 @@
 #define C_LIB_H_
 
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include "SSystem/SComponent/c_math.h"
 
 inline bool cLib_IsZero(f32 value) {

include/SSystem/SComponent/c_m3d.h

@@ -2,7 +2,7 @@
 #define C_M3D_H_
 
 #include <cmath>
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 class cM3dGAab;
 class cM3dGCps;

include/SSystem/SComponent/c_m3d_g_cir.h

@@ -1,7 +1,7 @@
 #ifndef C_M3D_G_CIR_H
 #define C_M3D_G_CIR_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class cM2dGCir {
 public:

include/SSystem/SComponent/c_malloc.h

@@ -1,7 +1,7 @@
 #ifndef C_MALLOC_H
 #define C_MALLOC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class JKRHeap;
 

include/SSystem/SComponent/c_phase.h

@@ -1,7 +1,7 @@
 #ifndef C_PHASE_H
 #define C_PHASE_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef int (*cPhs__Handler)(void*);
 

include/SSystem/SComponent/c_request.h

@@ -1,7 +1,7 @@
 #ifndef C_REQUEST_H
 #define C_REQUEST_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct request_base_class {
     u8 flag0 : 1;

include/SSystem/SComponent/c_sxyz.h

@@ -1,7 +1,7 @@
 #ifndef C_SXYZ_H
 #define C_SXYZ_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 struct SVec {
     s16 x, y, z;

include/SSystem/SComponent/c_tag.h

@@ -2,7 +2,7 @@
 #define C_TAG_H
 
 #include "SSystem/SComponent/c_node.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct node_list_class node_list_class;
 typedef struct node_lists_tree_class node_lists_tree_class;

include/SSystem/SComponent/c_xyz.h

@@ -1,7 +1,7 @@
 #ifndef C_XYZ_H
 #define C_XYZ_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include <cmath>
 
 struct cXyz : Vec {

include/SSystem/SStandard/s_basic.h

@@ -1,7 +1,7 @@
 #ifndef S_BASIC_H
 #define S_BASIC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue);
 void sBs_ClearArea(void* pPtr, u32 pNumBytes);

include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h

@@ -1,7 +1,7 @@
 #ifndef METROTRK_PORTABLE_DISPATCH_H
 #define METROTRK_PORTABLE_DISPATCH_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h

@@ -1,7 +1,7 @@
 #ifndef METROTRK_PORTABLE_MEM_TRK_H
 #define METROTRK_PORTABLE_MEM_TRK_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 void* TRK_memset(void* dest, int val, size_t count);
 void* TRK_memcpy(void* dest, const void* src, size_t count);

include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h

@@ -1,7 +1,7 @@
 #ifndef METROTRK_PORTABLE_MSG_H
 #define METROTRK_PORTABLE_MSG_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct _TRK_Msg {
 	u8 _00[8];

include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h

@@ -1,7 +1,7 @@
 #ifndef METROTRK_PORTABLE_MUTEX_TRK_H
 #define METROTRK_PORTABLE_MUTEX_TRK_H
 
-#include <revolution/types.h>
+#include <types.h>
 
 u8 TRKReleaseMutex();
 u8 TRKAcquireMutex();

include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h

@@ -1,7 +1,7 @@
 #ifndef OS_DOLPHIN_DDH_STUBS_H
 #define OS_DOLPHIN_DDH_STUBS_H
 
-#include <dolphin/amc/AmcExi2Comm.h>
+#include <amc/AmcExi2Comm.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h

@@ -1,7 +1,7 @@
 #ifndef OS_DOLPHIN_GDEV_STUBS_H
 #define OS_DOLPHIN_GDEV_STUBS_H
 
-#include <dolphin/amc/AmcExi2Comm.h>
+#include <amc/AmcExi2Comm.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h

@@ -1,7 +1,7 @@
 #ifndef OS_DOLPHIN_UDP_STUBS_H
 #define OS_DOLPHIN_UDP_STUBS_H
 
-#include <dolphin/os.h>
+#include <os.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h

@@ -1,7 +1,7 @@
 #ifndef OS_DOLPHIN_DOLPHIN_TRK_GLUE_H
 #define OS_DOLPHIN_DOLPHIN_TRK_GLUE_H
 
-#include <dolphin/os.h>
+#include <os.h>
 #include "trk.h"
 
 #ifdef __cplusplus

include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h

@@ -1,7 +1,7 @@
 #ifndef OS_DOLPHIN_TARGET_OPTIONS_H
 #define OS_DOLPHIN_TARGET_OPTIONS_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h

@@ -1,6 +1,6 @@
 #ifndef OS_DOLPHIN_USR_PUT_H
 #define OS_DOLPHIN_USR_PUT_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #endif /* OS_DOLPHIN_USR_PUT_H */

include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h

@@ -1,7 +1,7 @@
 #ifndef PPC_EXPORT_TARGSUPP_H
 #define PPC_EXPORT_TARGSUPP_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h

@@ -1,7 +1,7 @@
 #ifndef UTILS_COMMON_CIRCLEBUFFER_H
 #define UTILS_COMMON_CIRCLEBUFFER_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h

@@ -1,7 +1,7 @@
 #ifndef UTILS_COMMON_MWTRACE_H
 #define UTILS_COMMON_MWTRACE_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 void MWTRACE(u8, char*, ...);
 

include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h

@@ -1,7 +1,7 @@
 #ifndef UTILS_GC_MWCRITICALSECTION_GC_H
 #define UTILS_GC_MWCRITICALSECTION_GC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/Z2AudioCS/Z2AudioCS.h

@@ -3,7 +3,7 @@
 
 #include "Z2AudioCS/SpkTable.h"
 #include "Z2AudioCS/SpkSound.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class JKRHeap;
 class JKRArchive;

include/Z2AudioLib/Z2Calc.h

@@ -1,7 +1,7 @@
 #ifndef Z2CALC_H
 #define Z2CALC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "m_Do/m_Do_lib.h"
 
 namespace Z2Calc {

include/Z2AudioLib/Z2Param.h

@@ -1,7 +1,7 @@
 #ifndef Z2PARAM_H
 #define Z2PARAM_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct Z2Param {
     static f32 DISTANCE_MAX;

include/Z2AudioLib/Z2StatusMgr.h

@@ -2,7 +2,7 @@
 #define Z2STATUSMGR_H
 
 #include "JSystem/JAudio2/JASGadget.h"
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
     Z2StatusMgr();

include/d/actor/d_a_balloon_2D.h

@@ -1,7 +1,7 @@
 #ifndef D_A_BALLOON_2D_H
 #define D_A_BALLOON_2D_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_drawlist.h"

include/d/actor/d_a_door_bossL1.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_BOSSL1_H
 #define D_A_DOOR_BOSSL1_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_bg_w.h"
 #include "d/d_bg_s_acch.h"

include/d/actor/d_a_door_bossL5.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_BOSSL5_H
 #define D_A_DOOR_BOSSL5_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

include/d/actor/d_a_door_mbossL1.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_MBOSSL1_H
 #define D_A_DOOR_MBOSSL1_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

include/d/actor/d_a_door_shutter.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_SHUTTER_H
 #define D_A_DOOR_SHUTTER_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

include/d/actor/d_a_e_db_leaf.h

@@ -2,7 +2,7 @@
 #define D_A_E_DB_LEAF_H
 
 #include "d/d_com_inf_game.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 /**
  * @ingroup actors-enemies

include/d/actor/d_a_e_oct_bg.h

@@ -1,7 +1,7 @@
 #ifndef D_A_E_OCT_BG_H
 #define D_A_E_OCT_BG_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_bg_s_acch.h"
 #include "Z2AudioLib/Z2Creature.h"

include/d/actor/d_a_fr.h

@@ -4,7 +4,7 @@
 #include "d/d_bg_s_acch.h"
 #include "d/d_cc_d.h"
 #include "d/d_msg_flow.h"
-#include <dolphin/types.h>
+#include <types.h>
 #include "SSystem/SComponent/c_phase.h"
 #include "f_op/f_op_actor_mng.h"
 

include/d/actor/d_a_kytag12.h

@@ -1,7 +1,7 @@
 #ifndef D_A_KYTAG12_H
 #define D_A_KYTAG12_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_kytag13.h

@@ -1,7 +1,7 @@
 #ifndef D_A_KYTAG13_H
 #define D_A_KYTAG13_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_movie_player.h

@@ -1,7 +1,7 @@
 #ifndef D_A_MOVIE_PLAYER_H
 #define D_A_MOVIE_PLAYER_H
 
-#include <dolphin/thp.h>
+#include <thp.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_drawlist.h"
 

include/d/actor/d_a_npc_cd2.h

@@ -5,7 +5,7 @@
 #include "d/actor/d_a_tag_escape.h"
 #include "d/d_npc_lib.h"
 #include "d/d_path.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 enum {
     MdlMANa_e = 0,

include/d/actor/d_a_npc_toby.h

@@ -1,7 +1,7 @@
 #ifndef D_A_NPC_TOBY_H
 #define D_A_NPC_TOBY_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "d/actor/d_a_npc.h"
 
 struct daNpc_Toby_HIOParam {

include/d/actor/d_a_obj_avalanche.h

@@ -1,7 +1,7 @@
 #ifndef D_A_OBJ_AVALANCHE_H
 #define D_A_OBJ_AVALANCHE_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "d/d_bg_s_movebg_actor.h"
 #include "f_op/f_op_actor_mng.h"
 

include/d/actor/d_a_obj_bed.h

@@ -4,7 +4,7 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_s_acch.h"
 #include "f_op/f_op_actor.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class dBgW;
 

include/d/actor/d_a_obj_bmWindow.h

@@ -1,7 +1,7 @@
 #ifndef D_A_OBJ_BMWINDOW_H
 #define D_A_OBJ_BMWINDOW_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "d/d_bg_s_movebg_actor.h"
 #include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"

include/d/actor/d_a_obj_hata.h

@@ -2,7 +2,7 @@
 #define D_A_OBJ_HATA_H
 
 #include "SSystem/SComponent/c_phase.h"
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 
 /**

include/d/actor/d_a_obj_stopper.h

@@ -5,7 +5,7 @@
 #include "d/d_bg_s_movebg_actor.h"
 #include "d/d_cc_d.h"
 #include "d/d_particle.h"
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_path_line.h

@@ -1,6 +1,6 @@
 #ifndef D_A_PATH_LINE_H
 #define D_A_PATH_LINE_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #endif /* D_A_PATH_LINE_H */

include/d/actor/d_a_peru.h

@@ -2,7 +2,7 @@
 #define D_A_PERU_H
 
 #include "d/actor/d_a_tag_evtarea.h"
-#include <dolphin/types.h>
+#include <types.h>
 #include "d/actor/d_a_npc.h"
 #include "SSystem/SComponent/c_counter.h"
 

include/d/actor/d_a_ppolamp.h

@@ -1,7 +1,7 @@
 #ifndef D_A_PPOLAMP_H
 #define D_A_PPOLAMP_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_tag_kmsg.h

@@ -1,7 +1,7 @@
 #ifndef D_A_TAG_KMSG_H
 #define D_A_TAG_KMSG_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_msg_flow.h"

include/d/d_bg_pc.h

@@ -1,7 +1,7 @@
 #ifndef D_BG_D_BG_PC_H
 #define D_BG_D_BG_PC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct sBgPc {
     /* 0x00 */ u32 code0;

include/d/d_bg_s.h

@@ -3,7 +3,7 @@
 
 #include "d/d_bg_w_base.h"
 #include "JSystem/JHostIO/JORReflexible.h"
-#include <dolphin/os.h>
+#include <os.h>
 #include "global.h"
 
 class dBgW;

include/d/d_bg_w.h

@@ -4,8 +4,8 @@
 #include "SSystem/SComponent/c_m3d_g_aab.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "d/d_bg_w_base.h"
-#include <dolphin/mtx.h>
-#include <dolphin/types.h>
+#include <mtx.h>
+#include <types.h>
 
 class cBgS_GrpPassChk;
 class cBgS_PolyPassChk;

include/d/d_bg_w_base.h

@@ -4,7 +4,7 @@
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "SSystem/SComponent/c_bg_w.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
-#include <dolphin/gx.h>
+#include <gx.h>
 #include "f_pc/f_pc_base.h"
 
 class cBgS_GndChk;

include/d/d_cc_uty.h

@@ -2,7 +2,7 @@
 #define D_CC_D_CC_UTY_H
 
 #include "SSystem/SComponent/c_sxyz.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class cCcD_Obj;
 class fopAc_ac_c;

include/d/d_debug_viewer.h

@@ -1,7 +1,7 @@
 #ifndef D_DEBUG_VIEWER_H
 #define D_DEBUG_VIEWER_H
 
-#include <dolphin/gx.h>
+#include <gx.h>
 #include "SSystem/SComponent/c_xyz.h"
 #include "SSystem/SComponent/c_sxyz.h"
 

include/d/d_door_param2.h

@@ -1,7 +1,7 @@
 #ifndef D_D_DOOR_PARAM2_H
 #define D_D_DOOR_PARAM2_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class fopAc_ac_c;
 

include/d/d_event_lib.h

@@ -1,7 +1,7 @@
 #ifndef D_EVENT_D_EVENT_LIB_H
 #define D_EVENT_D_EVENT_LIB_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class fopAc_ac_c;
 

include/d/d_eye_hl.h

@@ -1,7 +1,7 @@
 #ifndef D_D_EYE_HL_H
 #define D_D_EYE_HL_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class J3DModelData;
 struct ResTIMG;

include/d/d_item.h

@@ -1,7 +1,7 @@
 #ifndef D_D_ITEM_H
 #define D_D_ITEM_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class dEnemyItem_c {
 public:

include/d/d_item_data.h

@@ -1,7 +1,7 @@
 #ifndef D_D_ITEM_DATA_H
 #define D_D_ITEM_DATA_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct dItem_itemInfo {
     /* 0x0 */ u8 mShadowSize;

include/d/d_jpreviewer.h

@@ -1,7 +1,7 @@
 #ifndef D_JPREVIEWER_H
 #define D_JPREVIEWER_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include "JSystem/JStudio/JStudio_JPreviewer/control.h"
 
 namespace JStudio {

include/d/d_kankyo_data.h

@@ -1,7 +1,7 @@
 #ifndef D_KANKYO_D_KANKYO_DATA_H
 #define D_KANKYO_D_KANKYO_DATA_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct color_RGB_class {
     /* 0x0 */ u8 r;

include/d/d_kankyo_rain.h

@@ -1,7 +1,7 @@
 #ifndef D_KANKYO_D_KANKYO_RAIN_H
 #define D_KANKYO_D_KANKYO_RAIN_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 struct cXyz;
 struct _GXColor;

include/d/d_kankyo_tev_str.h

@@ -3,7 +3,7 @@
 
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class dKy_tevstr_c {
 public:

include/d/d_lib.h

@@ -2,8 +2,8 @@
 #define D_D_LIB_H
 
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/mtx.h>
-#include <dolphin/os.h>
+#include <mtx.h>
+#include <os.h>
 
 class fopAc_ac_c;
 

include/d/d_menu_dmap.h

@@ -5,7 +5,7 @@
 #include "d/d_msg_flow.h"
 #include "d/d_menu_map_common.h"
 #include "d/d_map_path_dmap.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class CPaneMgr;
 struct CSTControl;

include/d/d_menu_fmap2D.h

@@ -7,7 +7,7 @@
 #include "d/d_menu_map_common.h"
 #include "d/d_meter_haihai.h"
 #include "d/d_pane_class.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class dMsgScrnExplain_c;
 

include/d/d_menu_fmap_map.h

@@ -2,7 +2,7 @@
 #define D_MENU_D_MENU_FMAP_MAP_H
 
 #include "SSystem/SComponent/c_counter.h"
-#include <dolphin/types.h>
+#include <types.h>
 #include <cstring>
 #include "d/d_menu_fmap.h"
 #include "d/d_map.h"

include/d/d_menu_map_common.h

@@ -1,7 +1,7 @@
 #ifndef D_MENU_D_MENU_MAP_COMMON_H
 #define D_MENU_D_MENU_MAP_COMMON_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class J2DPicture;
 class JKRArchive;

include/d/d_menu_window_HIO.h

@@ -1,7 +1,7 @@
 #ifndef D_MENU_D_MENU_WINDOW_HIO_H
 #define D_MENU_D_MENU_WINDOW_HIO_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class dMw_DHIO_c {
 public:

include/d/d_msg_flow.h

@@ -1,7 +1,7 @@
 #ifndef D_MSG_D_MSG_FLOW_H
 #define D_MSG_D_MSG_FLOW_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 enum {
     NODETYPE_MESSAGE_e = 1,

include/d/d_msg_out_font.h

@@ -1,7 +1,7 @@
 #ifndef D_MSG_D_MSG_OUT_FONT_H
 #define D_MSG_D_MSG_OUT_FONT_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class J2DPicture;
 class J2DTextBox;

include/d/d_msg_scrn_arrow.h

@@ -1,7 +1,7 @@
 #ifndef MSG_SCRN_D_MSG_SCRN_ARROW_H
 #define MSG_SCRN_D_MSG_SCRN_ARROW_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class J2DScreen;
 class J2DAnmTransform;

include/d/d_msg_scrn_item.h

@@ -1,7 +1,7 @@
 #ifndef MSG_SCRN_D_MSG_SCRN_ITEM_H
 #define MSG_SCRN_D_MSG_SCRN_ITEM_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "d/d_msg_scrn_base.h"
 
 class dMsgScrnArrow_c;

include/d/d_msg_scrn_talk.h

@@ -1,7 +1,7 @@
 #ifndef MSG_SCRN_D_MSG_SCRN_TALK_H
 #define MSG_SCRN_D_MSG_SCRN_TALK_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "d/d_msg_scrn_base.h"
 
 class dMsgScrnArrow_c;

include/d/d_particle_name.h

@@ -1,7 +1,7 @@
 #ifndef D_PARTICLE_D_PARTICLE_NAME_H
 #define D_PARTICLE_D_PARTICLE_NAME_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 // Room scenes use a bit to specify an ID is from a room particle pack, not the common particle pack
 #define dPa_RM(id) (0x8000 | (id))

include/d/d_path.h

@@ -1,8 +1,8 @@
 #ifndef D_D_PATH_H
 #define D_D_PATH_H
 
-#include <dolphin/types.h>
-#include <dolphin/mtx.h>
+#include <types.h>
+#include <mtx.h>
 
 class cBgS_PolyInfo;
 struct cXyz;

include/d/d_save.h

@@ -3,7 +3,7 @@
 
 #include <cstring>
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/os.h>
+#include <os.h>
 #include "global.h"
 #include "f_pc/f_pc_name.h"
 #include "JSystem/JUtility/JUTAssert.h"

include/d/d_tresure.h

@@ -1,7 +1,7 @@
 #ifndef D_D_TRESURE_H
 #define D_D_TRESURE_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 class dTres_c {
 public:

include/d/d_vib_pattern.h

@@ -1,7 +1,7 @@
 #ifndef D_D_VIB_PATTERN_H
 #define D_D_VIB_PATTERN_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 
 

include/f_op/f_op_view.h

@@ -2,7 +2,7 @@
 #define F_F_OP_VIEW_H_
 
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include "f_pc/f_pc_leaf.h"
 
 struct view_process_profile_definition {

include/f_pc/f_pc_create_iter.h

@@ -2,7 +2,7 @@
 #ifndef F_PC_CREATE_ITER_H_
 #define F_PC_CREATE_ITER_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct create_tag create_tag;
 

include/f_pc/f_pc_debug_sv.h

@@ -2,7 +2,11 @@
 #ifndef F_PC_DEBUG_SV_H_
 #define F_PC_DEBUG_SV_H_
 
-#include <dolphin/dolphin.h>
+#ifdef __REVOLUTION_SDK__
+#include <revolution.h>
+#else
+#include <dolphin.h>
+#endif
 
 #if DEBUG
 

include/f_pc/f_pc_deletor.h

@@ -2,7 +2,7 @@
 #ifndef F_PC_DELETOR_H_
 #define F_PC_DELETOR_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct base_process_class base_process_class;
 

include/f_pc/f_pc_draw.h

@@ -1,7 +1,7 @@
 #ifndef F_PC_DRAW_H_
 #define F_PC_DRAW_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct base_process_class base_process_class;
 

include/f_pc/f_pc_draw_priority.h

@@ -2,7 +2,7 @@
 #ifndef F_PC_DRAW_PRIORITY_H_
 #define F_PC_DRAW_PRIORITY_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct draw_priority_class {
     s16 priority;

include/f_pc/f_pc_layer_iter.h

@@ -1,7 +1,7 @@
 #ifndef F_PC_LAYER_ITER_H_
 #define F_PC_LAYER_ITER_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct layer_class layer_class;
 

include/f_pc/f_pc_load.h

@@ -2,7 +2,7 @@
 #ifndef F_PC_LOAD_H_
 #define F_PC_LOAD_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 BOOL fpcLd_Use(s16 i_procName);
 BOOL fpcLd_IsLoaded(s16 i_procName);

include/f_pc/f_pc_method.h

@@ -1,7 +1,7 @@
 #ifndef F_PC_METHOD_H_
 #define F_PC_METHOD_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef int (*process_method_func)(void*);
 

include/f_pc/f_pc_method_iter.h

@@ -2,7 +2,7 @@
 #ifndef F_PC_METHOD_ITER_H_
 #define F_PC_METHOD_ITER_H_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct node_list_class node_list_class;
 

include/f_pc/f_pc_pause.h

@@ -1,7 +1,7 @@
 #ifndef F_PC_PAUSE_
 #define F_PC_PAUSE_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 int fpcPause_IsEnable(void* pProc, u8 expected);
 int fpcPause_Enable(void* pProc, u8 pauseMask);