pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new-code

Browse Source
This commit is contained in:
Ethan Roseman 2021-01-11 16:08:49 +09:00
commit 1cba7c06f0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -119,6 +119,9 @@ GENERATED_HEADERS := include/ld_addrs.h $(foreach dir, $(NPC_DIRS), include/$(di
### Targets ###
clean:
rm -rf $(BUILD_DIR) $(LD_SCRIPT)
clean-all:
rm -rf $(BUILD_DIR) bin msg img sprite .splat_cache $(LD_SCRIPT)
clean-code:
@ -127,7 +130,8 @@ clean-code:
tools:
make -C tools
setup: clean submodules tools $(LD_SCRIPT)
setup: clean-all submodules tools
@make split
# tools/star-rod submodule intentionally omitted
submodules:
@ -146,6 +150,8 @@ split-all:
test: $(ROM)
$(EMULATOR) $<
%.bin: $(LD_SCRIPT)
# Compressed files
%.Yay0: %
@mkdir -p $(shell dirname $@)
@ -266,7 +272,6 @@ include/sprite/npc/%.h: sprite/npc/%/SpriteSheet.xml tools/gen_sprite_animations
$(LD_SCRIPT): $(SPLAT_YAML)
$(SPLAT) --modes ld bin Yay0 PaperMarioMapFS PaperMarioMessages img PaperMarioNpcSprites --new
make $(GENERATED_HEADERS)
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)
@mkdir -p $(shell dirname $@)

2
sources.mk
View File

@ -1,4 +1,4 @@
OBJECTS = $(subst BUILD_DIR, $(BUILD_DIR), $(shell grep -E 'BUILD_DIR.+\.o' papermario.ld -o))
OBJECTS := $(foreach OBJECT, $(shell $(PYTHON) tools/n64splat/list_objects.py $(SPLAT_YAML)), $(BUILD_DIR)/$(OBJECT))
DSL_C_FILES := $(shell grep -lrF "SCRIPT" src)