From 9a1dccfdde6973b29be77d0782a08046e678fb76 Mon Sep 17 00:00:00 2001 From: Damian Yerrick Date: Sun, 31 Mar 2024 19:52:16 -0400 Subject: [PATCH] restore devkitARM makefile keep Actions workflow on devkitARM until ported to Wonderful --- .github/workflows/build-artifact.yml | 4 ++-- gba/dkaMakefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index 6bdbc48..d526ccb 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -73,10 +73,10 @@ jobs: sudo apt-get update sudo apt-get install python3-pil -y - - name: Run makefile + - name: Run devkitARM makefile run: | cd gba - make + make -f dkaMakefile - name: Upload ROM binaries uses: actions/upload-artifact@master diff --git a/gba/dkaMakefile b/gba/dkaMakefile index 3400275..7815ce3 100644 --- a/gba/dkaMakefile +++ b/gba/dkaMakefile @@ -142,7 +142,7 @@ $(TARGET).gba $(TARGET).elf: $(BUILD) #--------------------------------------------------------------------------------- $(BUILD): @[ -d $@ ] || mkdir -p $@ - @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile + @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/dkaMakefile #--------------------------------------------------------------------------------- clean: