diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4135da70..d7936157 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: run: | python configure.py --version ${{ matrix.version }} \ --binutils /binutils --compilers /compilers - ninja all_source build/${{ matrix.version }}/progress.json + ninja build/${{ matrix.version }}/progress.json # Upload progress if we're on the main branch - name: Upload progress diff --git a/include/Kaneshige/LightMgr.h b/include/Kaneshige/LightMgr.h index f2727d98..d61b054c 100644 --- a/include/Kaneshige/LightMgr.h +++ b/include/Kaneshige/LightMgr.h @@ -2,6 +2,7 @@ #define LIGHTMGR_H #include "JSystem/JGeometry.h" +#include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/TColor.h" #include "types.h" diff --git a/include/Kawano/PrintPal.h b/include/Kawano/PrintPal.h index d94846c7..13923d01 100644 --- a/include/Kawano/PrintPal.h +++ b/include/Kawano/PrintPal.h @@ -25,7 +25,7 @@ class PrintPal { // Maybe swap these names int getState() { return _74; } int getOption() { return _78; } - int setOption(int val) { _78 = val; } + void setOption(int val) { _78 = val; } private: // TODO diff --git a/include/Sato/ItemFlyTurtle.h b/include/Sato/ItemFlyTurtle.h index 88c5ecb4..62cb149e 100644 --- a/include/Sato/ItemFlyTurtle.h +++ b/include/Sato/ItemFlyTurtle.h @@ -8,7 +8,7 @@ #include "Sato/ObjUtility.h" // TODO: virtual and static functions - +class CLPointControllerFlyTurtle; class ItemFlyTurtle : public ItemObj { public: diff --git a/src/Sato/ItemObjMgr.cpp b/src/Sato/ItemObjMgr.cpp index 828db50a..efa4be15 100644 --- a/src/Sato/ItemObjMgr.cpp +++ b/src/Sato/ItemObjMgr.cpp @@ -19,8 +19,6 @@ #include "Sato/stMath.h" #include "Yamamoto/kartCamera.h" -#include - #include "mathHelper.h" // WIP