makefile improvements

This commit is contained in:
Robin Jones 2023-03-12 23:19:28 +00:00
parent 5485aef989
commit 7b8a72f3db
2 changed files with 10 additions and 5 deletions

View File

@ -46,7 +46,7 @@ jobs:
mkdir build mkdir build
mkdir output mkdir output
# TODO: split this to use params for each flashcart type. # TODO: split this to use params for each flashcart type.
make -j all make menu
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
@ -80,6 +80,7 @@ jobs:
- name: Finalize rom - name: Finalize rom
run: | run: |
# make all
python ./tools/sc64/minify.py ./build/N64FlashcartMenu.elf ./output/N64FlashcartMenu.z64 ./output/sc64menu.n64 python ./tools/sc64/minify.py ./build/N64FlashcartMenu.elf ./output/N64FlashcartMenu.z64 ./output/sc64menu.n64
continue-on-error: false continue-on-error: false

View File

@ -1,4 +1,4 @@
.DEFAULT_GOAL := all .DEFAULT_GOAL := menu
EXE_NAME = N64FlashcartMenu EXE_NAME = N64FlashcartMenu
@ -32,10 +32,14 @@ $(BUILD_DIR)/$(EXE_NAME).elf: $(OBJS)
$(EXE_NAME).z64: N64_ROM_TITLE=$(EXE_NAME) $(EXE_NAME).z64: N64_ROM_TITLE=$(EXE_NAME)
all: $(EXE_NAME).z64 menu: $(EXE_NAME).z64
$(shell mkdir $(OUTPUT_DIR)) $(shell mkdir -p $(OUTPUT_DIR))
$(shell mv $(EXE_NAME).z64 $(OUTPUT_DIR)) $(shell mv $(EXE_NAME).z64 $(OUTPUT_DIR))
sc64_minify:
$(shell python3 ./tools/sc64/minify.py $(BUILD_DIR)/$(EXE_NAME).elf $(OUTPUT_DIR)/N64FlashcartMenu.z64 $(OUTPUT_DIR)/sc64menu.n64) $(shell python3 ./tools/sc64/minify.py $(BUILD_DIR)/$(EXE_NAME).elf $(OUTPUT_DIR)/N64FlashcartMenu.z64 $(OUTPUT_DIR)/sc64menu.n64)
all: menu sc64_minify
.PHONY: all .PHONY: all
clean: clean: