From f67394bb3e461ce6b8a73bdafa3ac85e782339d5 Mon Sep 17 00:00:00 2001 From: Korbo Date: Sun, 6 Jul 2025 17:29:42 -0500 Subject: [PATCH] Actually fix CI --- .github/workflows/ci.yml | 1 + CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f9749e5..caac37e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,7 @@ jobs: cache: 'true' - name: Install 3DS dependencies + if: ${{ matrix.n3ds }} run: | wget https://github.com/diasurgical/bannertool/releases/download/1.2.0/bannertool.zip unzip -j "bannertool.zip" "linux-x86_64/bannertool" -d "/opt/devkitpro/tools/bin" diff --git a/CMakeLists.txt b/CMakeLists.txt index cfe74683..d4443723 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -762,13 +762,15 @@ if(NINTENDO_3DS) OUTPUT "isle.bnr" COMMAND "${BANNERTOOL}" makebanner -i "ISLE/res/3ds/banner.png" -a "ISLE/res/3ds/banner.wav" -o "isle.bnr" DEPENDS "ISLE/res/3ds/banner.png" "ISLE/res/3ds/banner.wav" + VERBATIM ) add_custom_command( OUTPUT "isle.cia" - COMMAND "${MAKEROM}" -f cia -exefslogo -o "isle.cia" -rsf "ISLE/res/3ds/template.rsf" -major "${CMAKE_PROJECT_VERSION_MAJOR}" -minor "${CMAKE_PROJECT_VERSION_MINOR}" -micro 0 -icon "isle.smdh" -banner "isle.bnr" -elf "isle.elf" + COMMAND "${MAKEROM}" -f cia -exefslogo -o "isle.cia" -rsf "../ISLE/res/3ds/template.rsf" -major "${CMAKE_PROJECT_VERSION_MAJOR}" -minor "${CMAKE_PROJECT_VERSION_MINOR}" -micro 0 -icon "isle.smdh" -banner "isle.bnr" -elf "isle.elf" DEPENDS "ISLE/res/3ds/template.rsf" "isle.smdh" "isle.bnr" COMMENT "Building CIA executable target isle.cia" + VERBATIM ) add_custom_target("isle_cia" ALL DEPENDS "isle.cia" isle)