diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-09 22:37:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 22:37:08 +0300 |
| commit | caba1031233657d89f3c35079e664551a07cd72f (patch) | |
| tree | 9d4fb9b4cee8f4b3697f9103e28897d7cd225de2 /Makefile | |
| parent | c8f98c38d5baf6bf86531188b1a6ff0745d8d8c9 (diff) | |
| parent | 912f95b5d5125f1d20b80c9909527259c09c1262 (diff) | |
Merge pull request #152 from PikalaxALT/pikalax_work
Some cleanup; grow2bin is now a general purpose csv2bin converter for integers
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 8 insertions, 13 deletions
@@ -1,7 +1,6 @@ # Makefile to build Pokemon Diamond image include config.mk -include filesystem.mk HOSTCC = $(CC) HOSTCXX = $(CXX) @@ -204,6 +203,7 @@ JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx MWASMARM_PATCHER = $(TOOLS_DIR)/mwasmarm_patcher/mwasmarm_patcher$(EXE) -q MAKEBANNER = $(WINE) $(TOOLS_DIR)/bin/makebanner.exe +MAKEROM = $(WIND) $(TOOLS_DIR)/bin/makerom.exe TOOLDIRS = $(filter-out $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*)) TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%) @@ -300,9 +300,16 @@ $(ELF): $(BUILD_DIR)/$(LD_SCRIPT) $(O_FILES) $(BINFILES) $(BUILD_DIR)/pokediamon $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill=0xFF --pad-to=0x04000000 $< $@ +# 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): pokediamond.rsf $(BUILD_DIR)/pokediamond_bnr.bin $(SBINFILES) $(HOSTFS_FILES) +# $(MAKEROM) -DNITROFS_FILES="$(NITROFS_FILES)" $< $@ + # Make sure build directory exists before compiling anything DUMMY != mkdir -p $(ALL_DIRS) +include filesystem.mk + %.4bpp: %.png $(GFX) $< $@ @@ -318,18 +325,6 @@ DUMMY != mkdir -p $(ALL_DIRS) %.png: ; %.pal: ; -%.narc: - $(KNARC) -d $(basename $@)/ -p $@ - -%.arc: - $(KNARC) -d $(basename $@)/ -p $@ - -files/poketool/personal/pms.narc: ; - -files/poketool/personal/growtbl.narc: $(wildcard files/poketool/personal/growtbl/*.txt) - $(MAKE) -C $(<D) - $(NARCCOMP) -o $@ -p 255 $(^:%.txt=%.bin) - ######################## Misc ####################### $(BUILD_DIR)/pokediamond_bnr.bin: pokediamond.bsf graphics/icon.4bpp graphics/icon.gbapal |