diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-02 22:13:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 22:13:57 +0100 |
| commit | 9d3d4a2acff67f43896e9e0dcd26e7aaeb55e3b3 (patch) | |
| tree | d707aa8fead427dadbbb29b886875e6c8961bd5a /Makefile | |
| parent | a2a17a9426f16ee601ff17840b8bb7851fef7138 (diff) | |
| parent | 7e32d3758e7e36d7a67a1442cdb9386f9aa18a6e (diff) | |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -162,6 +162,7 @@ clean: mostlyclean clean-fs clean-tools clean-fs: $(RM) $(filter %.narc %.arc,$(HOSTFS_FILES)) + $(RM) $(patsubst %.narc,%.naix,$(patsubst %.arc,%.naix,$(filter %.narc %.arc,$(HOSTFS_FILES)))) $(RM) $(NCGR_CLEAN_LIST) $(NCLR_CLEAN_LIST) $(NCER_CLEAN_LIST) $(NSCR_CLEAN_LIST) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} + $(RM) files/msgdata/msg/narc_*.bin @@ -204,7 +205,7 @@ $(BUILD_DIR)/%.o: %.c $$(dep) $(BUILD_DIR)/%.o: %.s $$(dep) $(AS) $(ASFLAGS) $< -o $@ -arm9: +arm9: filesystem $(MAKE) -C arm9 $(MAKE_VARS) arm7: @@ -214,7 +215,7 @@ include filesystem.mk # TODO: Rules for Pearl # FIXME: Computed secure area CRC in header is incorrect due to first 8 bytes of header not actually being "encryObj" -$(ROM): rom.rsf arm9 arm7 filesystem $(BNR) tools/bin/rom_header.template.sbin +$(ROM): rom.rsf arm9 arm7 $(BNR) tools/bin/rom_header.template.sbin $(MAKEROM) -DBUILD_DIR="$(BUILD_DIR)" -DBNR="$(BNR)" -DTITLE_NAME="$(TITLE_NAME)" -DNITROFS_FILES="$(NITROFS_FILES)" $< $@ ifeq ($(SHIFTED),0) $(FIXROM) $@ --secure-crc $(SECURE_CRC) --game-code $(GAME_CODE) |