From fab5b4a5aa87c1bb59cb0bf6490d7972f961bb4f Mon Sep 17 00:00:00 2001 From: Echo J Date: Tue, 16 Sep 2025 07:16:15 +0300 Subject: [PATCH 1/5] NDS: Update the old Makefile paths --- misc/nds/Makefile | 10 +++++----- misc/nds/Makefile.arm7 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/nds/Makefile b/misc/nds/Makefile index 3c1871503..b10e01386 100644 --- a/misc/nds/Makefile +++ b/misc/nds/Makefile @@ -7,7 +7,7 @@ export BLOCKSDSEXT ?= /opt/wonderful/thirdparty/blocksds/external GAME_TITLE := ClassiCube GAME_SUBTITLE := Built with BlocksDS GAME_AUTHOR := ClassiCube team -GAME_ICON := misc/ds/icon.bmp +GAME_ICON := misc/nds/icon.bmp GAME_FULL_TITLE := $(GAME_TITLE);$(GAME_SUBTITLE);$(GAME_AUTHOR) @@ -36,15 +36,15 @@ endif all: $(ROM) clean: - $(MAKE) -f Makefile.arm9 clean --no-print-directory - $(MAKE) -f Makefile.arm7 clean --no-print-directory + $(MAKE) -f misc/nds/Makefile.arm9 clean --no-print-directory + $(MAKE) -f misc/nds/Makefile.arm7 clean --no-print-directory $(RM) $(ROM) $(BUILDDIR) $(SDIMAGE) arm9: - $(MAKE) -f misc/ds/Makefile.arm9 --no-print-directory + $(MAKE) -f misc/nds/Makefile.arm9 --no-print-directory arm7: - $(MAKE) -f misc/ds/Makefile.arm7 --no-print-directory + $(MAKE) -f misc/nds/Makefile.arm7 --no-print-directory $(ROM): arm9 arm7 diff --git a/misc/nds/Makefile.arm7 b/misc/nds/Makefile.arm7 index b486d323b..6deb6c42c 100644 --- a/misc/nds/Makefile.arm7 +++ b/misc/nds/Makefile.arm7 @@ -6,7 +6,7 @@ export BLOCKSDSEXT ?= /opt/wonderful/thirdparty/blocksds/external export WONDERFUL_TOOLCHAIN ?= /opt/wonderful ARM_NONE_EABI_PATH ?= $(WONDERFUL_TOOLCHAIN)/toolchain/gcc-arm-none-eabi/bin/ -SOURCEDIRS := misc/ds +SOURCEDIRS := misc/nds INCLUDEDIRS := DSIWIFI := third_party/dsiwifi From 19f625947b55d1a625ce8aa1c60db866cc68fb16 Mon Sep 17 00:00:00 2001 From: Echo J Date: Tue, 16 Sep 2025 08:32:25 +0300 Subject: [PATCH 2/5] NDS: Fix level of header include paths --- src/nds/Graphics_NDS.c | 10 +++++----- src/nds/Platform_NDS.c | 22 +++++++++++----------- src/nds/Window_NDS.c | 22 +++++++++++----------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/nds/Graphics_NDS.c b/src/nds/Graphics_NDS.c index a96b92d49..414a7afd3 100644 --- a/src/nds/Graphics_NDS.c +++ b/src/nds/Graphics_NDS.c @@ -1,9 +1,9 @@ -#include "_GraphicsBase.h" -#include "Errors.h" -#include "Logger.h" -#include "Window.h" +#include "../_GraphicsBase.h" +#include "../Errors.h" +#include "../Logger.h" +#include "../Window.h" #include -#include "_BlockAlloc.h" +#include "../_BlockAlloc.h" #define DS_MAT_PROJECTION 0 #define DS_MAT_POSITION 1 diff --git a/src/nds/Platform_NDS.c b/src/nds/Platform_NDS.c index e39bbc349..dd47bf40f 100644 --- a/src/nds/Platform_NDS.c +++ b/src/nds/Platform_NDS.c @@ -2,15 +2,15 @@ #define CC_NO_DYNLIB #define CC_XTEA_ENCRYPTION -#include "_PlatformBase.h" -#include "Stream.h" -#include "ExtMath.h" -#include "Funcs.h" -#include "Window.h" -#include "Utils.h" -#include "Errors.h" -#include "Options.h" -#include "Animations.h" +#include "../_PlatformBase.h" +#include "../Stream.h" +#include "../ExtMath.h" +#include "../Funcs.h" +#include "../Window.h" +#include "../Utils.h" +#include "../Errors.h" +#include "../Options.h" +#include "../Animations.h" #include #include @@ -31,7 +31,7 @@ #include #include #ifdef BUILD_DSI -#include "../third_party/dsiwifi/include/dsiwifi9.h" +#include #else #include #endif @@ -40,7 +40,7 @@ #include #include #include -#include "_PlatformConsole.h" +#include "../_PlatformConsole.h" const cc_result ReturnCode_FileShareViolation = 1000000000; // not used const cc_result ReturnCode_FileNotFound = ENOENT; diff --git a/src/nds/Window_NDS.c b/src/nds/Window_NDS.c index 32e49b3be..c8907a1ad 100644 --- a/src/nds/Window_NDS.c +++ b/src/nds/Window_NDS.c @@ -1,14 +1,14 @@ -#include "Window.h" -#include "Platform.h" -#include "Input.h" -#include "Event.h" -#include "Graphics.h" -#include "String.h" -#include "Funcs.h" -#include "Bitmap.h" -#include "Errors.h" -#include "ExtMath.h" -#include "Camera.h" +#include "../Window.h" +#include "../Platform.h" +#include "../Input.h" +#include "../Event.h" +#include "../Graphics.h" +#include "../String.h" +#include "../Funcs.h" +#include "../Bitmap.h" +#include "../Errors.h" +#include "../ExtMath.h" +#include "../Camera.h" #include #include #include From d606a2c7d34ebdd22d558b2ad36e5103f9b24cee Mon Sep 17 00:00:00 2001 From: Echo J Date: Tue, 16 Sep 2025 07:18:30 +0300 Subject: [PATCH 3/5] Saturn: Update the yaul image version --- .github/workflows/build_saturn.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_saturn.yml b/.github/workflows/build_saturn.yml index 015d16a90..3e8edaf7a 100644 --- a/.github/workflows/build_saturn.yml +++ b/.github/workflows/build_saturn.yml @@ -16,13 +16,13 @@ jobs: timeout-minutes: 10 runs-on: ubuntu-latest container: - image: ijacquez/yaul:1.0.10 + image: ijacquez/yaul:latest steps: - uses: actions/checkout@v4 - name: Install prerequisites run: | - apt-get --allow-unauthenticated update - apt-get --allow-unauthenticated -y install curl + apt-get update + apt-get -y install curl - name: Compile Saturn build id: compile From a6398b12fad5882ea16293175c0a241def2d4b89 Mon Sep 17 00:00:00 2001 From: Echo J Date: Tue, 16 Sep 2025 08:02:32 +0300 Subject: [PATCH 4/5] Saturn: Remove the problematic dependency fetch --- .github/workflows/build_saturn.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build_saturn.yml b/.github/workflows/build_saturn.yml index 3e8edaf7a..6f6770477 100644 --- a/.github/workflows/build_saturn.yml +++ b/.github/workflows/build_saturn.yml @@ -19,11 +19,6 @@ jobs: image: ijacquez/yaul:latest steps: - uses: actions/checkout@v4 - - name: Install prerequisites - run: | - apt-get update - apt-get -y install curl - - name: Compile Saturn build id: compile run: | From c0bb55a83b5d8a2a10b0f96c527fd7d91162c04c Mon Sep 17 00:00:00 2001 From: Echo J Date: Tue, 16 Sep 2025 08:27:53 +0300 Subject: [PATCH 5/5] Saturn/NDS: Make ELF artifacts appear in Actions build --- .github/workflows/build_nds.yml | 4 ++-- misc/saturn/Makefile | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_nds.yml b/.github/workflows/build_nds.yml index 9ffd175fd..526ef7ed8 100644 --- a/.github/workflows/build_nds.yml +++ b/.github/workflows/build_nds.yml @@ -48,7 +48,7 @@ jobs: - uses: ./.github/actions/upload_build if: ${{ always() && steps.compile.outcome == 'success' }} with: - SOURCE_FILE: 'build-nds/cc-arm9.elf' + SOURCE_FILE: 'build/nds/cc-arm9.elf' DEST_NAME: 'ClassiCube-nds.elf' - uses: ./.github/actions/upload_build @@ -60,7 +60,7 @@ jobs: - uses: ./.github/actions/upload_build if: ${{ always() && steps.compile.outcome == 'success' }} with: - SOURCE_FILE: 'build-dsi/cc-arm9.elf' + SOURCE_FILE: 'build/dsi/cc-arm9.elf' DEST_NAME: 'ClassiCube-dsi.elf' diff --git a/misc/saturn/Makefile b/misc/saturn/Makefile index 52ba00908..9254d5baf 100644 --- a/misc/saturn/Makefile +++ b/misc/saturn/Makefile @@ -90,7 +90,10 @@ clean: $(BUILD_DIR)/$(TARGET).elf: $(SH_OBJS) $(SH_LD) $(foreach specs,$(SH_SPECS),-specs=$(specs)) $(SH_OBJS) $(SH_LDFLAGS) -o $@ -$(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf +$(TARGET).elf: $(BUILD_DIR)/$(TARGET).elf + cp $< $@ + +$(BUILD_DIR)/$(TARGET).bin: $(TARGET).elf $(SH_OBJCOPY) -O binary $< $@ @[ -z "${SILENT}" ] && du -hs $@ | awk '{ print $$1; }' || true