Merge new headers & libkiwi

.clang-format

@@ -12,59 +12,52 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
 FixNamespaceComments: true
 AccessModifierOffset: -4
 AllowShortFunctionsOnASingleLine: Empty
-WhitespaceSensitiveMacros: [
-  NW4R_UT_LINKLIST_FOREACH, 
-  NW4R_UT_LINKLIST_FOREACH_SAFE,
-  NW4R_UT_LIST_FOREACH,
-  NW4R_UT_LIST_FOREACH_SAFE,
-  NW4R_EF_LIST_FOREACH,
-  NW4R_EF_LIST_FOREACH_SAFE,
-  EGG_ASSERT,
-  EGG_ASSERT_MSG,
-  K_ASM,
-  KOKESHI_BY_PACK,
-  KM_BRANCH_MF,
-  KM_BRANCH,
-  KM_CALL_MF,
-  KM_CALL,
-  ASM,
-  TRAMPOLINE,
-  TRAMPOLINE_EX,
-]
-AttributeMacros: [DECOMP_INLINE, DECOMP_DONT_INLINE]
-InsertNewlineAtEOF: true
 ForEachMacros: [K_FOREACH]
+AttributeMacros: [DECOMP_INLINE, DECOMP_DONT_INLINE]
+WhitespaceSensitiveMacros:
+  [
+    DECOMP_FORCEACTIVE,
+    DECOMP_FORCELITERAL,
+    DECOMP_FORCEACTIVE_DTOR,
+    NW4R_UT_LINKLIST_FOREACH,
+    NW4R_UT_LINKLIST_FOREACH_SAFE,
+    NW4R_UT_LIST_FOREACH,
+    NW4R_UT_LIST_FOREACH_SAFE,
+    NW4R_EF_LIST_FOREACH,
+    NW4R_EF_LIST_FOREACH_SAFE,
+    EGG_ASSERT,
+    EGG_ASSERT_MSG,
+    KOKESHI_BY_PACK,
+    KM_BRANCH,
+    KM_CALL,
+    KM_BRANCH_MF,
+    KM_CALL_MF,
+  ]
 
 IncludeCategories:
-  - Regex:           '<types.h>'
-    Priority:        -1
-
-  - Regex:           '"'
-    Priority:        1
-
-  - Regex:           '^<(nw4r|egg|Pack)?(\/)?types'     # "Types" headers
-    Priority:        2
-    CaseSensitive:   true
+  - Regex: '^<(nw4r|egg|Pack)?(\/)?types' # "Types" headers
+    Priority: 0
+    CaseSensitive: true
 
-  - Regex:           '<libkiwi.h>' # libkiwi public headers
-    Priority:        4
-    CaseSensitive:   true
+  - Regex: "<libkiwi.h>" # libkiwi public headers
+    Priority: 2
+    CaseSensitive: true
 
-  - Regex:           '<egg\/[[:lower:].]+h>' # EGG public headers
-    Priority:        5
-    CaseSensitive:   true
+  - Regex: '<egg\/[[:lower:].]+h>' # EGG public headers
+    Priority: 3
+    CaseSensitive: true
 
-  - Regex:           '<nw4r\/[[:lower:].]+h>' # NW4R public headers
-    Priority:        6
-    CaseSensitive:   true
+  - Regex: '<nw4r\/[[:lower:].]+h>' # NW4R public headers
+    Priority: 4
+    CaseSensitive: true
 
-  - Regex:           '^<revolution\/[[:upper:].]+h>' # RVL SDK public headers
-    Priority:        7
-    CaseSensitive:   true
+  - Regex: '^<revolution\/[[:upper:].]+h>' # RVL SDK public headers
+    Priority: 5
+    CaseSensitive: true
 
-  - Regex:           '<[[:alnum:].]+>' # STL headers
-    Priority:        8                 # Priority 0 is header mapped to src file
-    CaseSensitive:   true
+  - Regex: "<[[:alnum:].]+>" # STL headers
+    Priority: 6 # Priority 0 is header mapped to src file
+    CaseSensitive: true
 
-  - Regex:           '.*' # All other headers
-    Priority:        3
+  - Regex: ".*" # All other headers
+    Priority: 1

.gitignore

@@ -1,3 +1,8 @@
+#=========================================================#
+# OS Files
+#=========================================================#
+.DS_Store
+
 #=========================================================#
 # IDE Configuration
 #=========================================================#
@@ -10,19 +15,17 @@
 # Base ROM filesystem
 romfs/**
 # Base ROM executable(s)
-baserom*.dol
+base/**.dol
 
 #=========================================================#
 # Tools
 #=========================================================#
-# Kamek
-tools/Kamek/*
-tools/Kamek*.*
+# Executables
+tools/kamek/*
+!tools/kamek/.gitkeep
 # CodeWarrior
-tools/mwasmeppc.exe
-tools/mwcceppc.exe
-tools/mwldeppc.exe
-tools/*.dll
+tools/codewarrior/*
+!tools/codewarrior/.gitkeep
 # Compiled Python
 tools/**/*.pyc
 
@@ -33,3 +36,7 @@ tools/**/*.pyc
 build/**
 # Symbol maps
 *.MAP
+# Ninja artifacts
+.ninja_deps
+.ninja_log
+build.ninja

README.md

@@ -35,9 +35,9 @@ Kokeshi supports the following games:
 #### Tools
 1. Install GNU `make`. If you have DevKitPRO or Windows Subsystem for Linux you may already have the tool installed.
 2. Download the latest release of [the PackProject fork of Kamek](https://github.com/PackProject/Kamek/releases/latest).
-   1. Install the contents of the zip file to the `tools/` directory.
+   1. Install the contents of the zip file to the `tools/kamek` directory.
 3. Download the Wii v1.7 version of [the CodeWarrior compiler](https://files.decomp.dev/compilers_20230715.zip).
-   1. Install the contents of the `Wii/1.7/` folder to the `tools/` directory.
+   1. Install the contents of the `Wii/1.7/` folder to the `tools/codewarrior` directory.
 
 #### Filesystem
 1. For each game that you want to build for, extract its filesystem using Dolphin Emulator.