Merge pull request #1436 from TheComputerGuy96/saturn-ds-build-fix

Saturn/NDS build fixes

.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'
           
           

.github/workflows/build_saturn.yml

@@ -16,14 +16,9 @@ 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
-
       - name: Compile Saturn build
         id: compile
         run: |

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 misc/nds/Makefile.arm9 clean --no-print-directory
-	$(MAKE) -f Makefile.arm7 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

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
 

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
 

src/nds/Graphics_NDS.c

@@ -1,9 +1,9 @@
-#include "_GraphicsBase.h"
+#include "../_GraphicsBase.h"
-#include "Errors.h"
+#include "../Errors.h"
-#include "Logger.h"
+#include "../Logger.h"
-#include "Window.h"
+#include "../Window.h"
 #include <nds.h>
-#include "_BlockAlloc.h"
+#include "../_BlockAlloc.h"
 
 #define DS_MAT_PROJECTION 0
 #define DS_MAT_POSITION   1

src/nds/Platform_NDS.c

@@ -2,15 +2,15 @@
 #define CC_NO_DYNLIB
 
 #define CC_XTEA_ENCRYPTION
-#include "_PlatformBase.h"
+#include "../_PlatformBase.h"
-#include "Stream.h"
+#include "../Stream.h"
-#include "ExtMath.h"
+#include "../ExtMath.h"
-#include "Funcs.h"
+#include "../Funcs.h"
-#include "Window.h"
+#include "../Window.h"
-#include "Utils.h"
+#include "../Utils.h"
-#include "Errors.h"
+#include "../Errors.h"
-#include "Options.h"
+#include "../Options.h"
-#include "Animations.h"
+#include "../Animations.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -31,7 +31,7 @@
 #include <nds/arm9/exceptions.h>
 #include <fat.h>
 #ifdef BUILD_DSI
-#include "../third_party/dsiwifi/include/dsiwifi9.h"
+#include <dsiwifi9.h>
 #else
 #include <dswifi9.h>
 #endif
@@ -40,7 +40,7 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <dirent.h>
-#include "_PlatformConsole.h"
+#include "../_PlatformConsole.h"
 
 const cc_result ReturnCode_FileShareViolation = 1000000000; // not used
 const cc_result ReturnCode_FileNotFound     = ENOENT;

src/nds/Window_NDS.c

@@ -1,14 +1,14 @@
-#include "Window.h"
+#include "../Window.h"
-#include "Platform.h"
+#include "../Platform.h"
-#include "Input.h"
+#include "../Input.h"
-#include "Event.h"
+#include "../Event.h"
-#include "Graphics.h"
+#include "../Graphics.h"
-#include "String.h"
+#include "../String.h"
-#include "Funcs.h"
+#include "../Funcs.h"
-#include "Bitmap.h"
+#include "../Bitmap.h"
-#include "Errors.h"
+#include "../Errors.h"
-#include "ExtMath.h"
+#include "../ExtMath.h"
-#include "Camera.h"
+#include "../Camera.h"
 #include <nds/arm9/background.h>
 #include <nds/arm9/input.h>
 #include <nds/arm9/keyboard.h>