Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reduce verbose of command #614

Merged
merged 3 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 24 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -423,12 +423,12 @@ endif

assets:
@echo "Extracting torch assets..."
@$(TORCH) code $(BASEROM)
@$(TORCH) header $(BASEROM)
@$(TORCH) modding export $(BASEROM)
$(V)$(TORCH) code $(BASEROM)
$(V)$(TORCH) header $(BASEROM)
$(V)$(TORCH) modding export $(BASEROM)

doc:
$(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py
$(V)$(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py
doxygen
@$(PRINT) "$(GREEN)Documentation generated in docs/html$(NO_COL)\n"
@$(PRINT) "$(GREEN)Results can be viewed by opening docs/html/index.html in a web browser$(NO_COL)\n"
Expand All @@ -438,7 +438,7 @@ clean:

distclean: distclean_assets
$(RM) -r $(BUILD_DIR_BASE)
./extract_assets.py --clean
$(PYTHON) extract_assets.py --clean
make -C $(TOOLS_DIR) clean

distclean_assets: ;
Expand All @@ -458,10 +458,11 @@ DUMMY != mkdir -p $(ALL_DIRS)

# RGBA32, RGBA16, IA16, IA8, IA4, IA1, I8, I4
$(BUILD_DIR)/%: %.png
$(N64GRAPHICS) -i $@ -g $< -f $(lastword $(subst ., ,$@))
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -f $(lastword $(subst ., ,$@))

$(BUILD_DIR)/textures/%.mio0: $(BUILD_DIR)/textures/%
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

ASSET_INCLUDES := $(shell find $(ASSET_DIR)/include -type f -name "*.mk")

Expand All @@ -483,14 +484,14 @@ $(BUILD_DIR)/%.mio0.o: $(BUILD_DIR)/%.mio0.s

$(BUILD_DIR)/%.mio0.s: $(BUILD_DIR)/%.mio0
$(call print,Generating mio0 asm:,$<,$@)
$(PRINT) ".section .data\n\n.balign 4\n\n.incbin \"$<\"\n" > $@
$(V)$(PRINT) ".section .data\n\n.balign 4\n\n.incbin \"$<\"\n" > $@

$(BUILD_DIR)/src/crash_screen.o: src/crash_screen.c
@$(PRINT) "$(GREEN)Compiling Crash Screen: $(BLUE)$@ $(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/crash_screen/crash_screen_font.ia1.inc.c -g textures/crash_screen/crash_screen_font.ia1.png -f ia1 -s u8
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@
$(V)$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@

#==============================================================================#
# Common Textures Segment Generation #
Expand All @@ -502,18 +503,20 @@ TEXTURE_FILES_TLUT := $(foreach dir,$(TEXTURE_DIRS)/tlut,$(subst .png, , $(wildc


$(TEXTURE_FILES):
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/[email protected] -g [email protected] -f $(lastword $(subst ., ,$@)) -s u8

# TLUT
$(TEXTURE_FILES_TLUT):
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/[email protected] -g [email protected] -f $(lastword $(subst ., ,$@)) -s u8 -c $(lastword $(subst ., ,$(subst .$(lastword $(subst ., ,$(TEXTURE_FILES_TLUT))), ,$(TEXTURE_FILES_TLUT)))) -p $(BUILD_DIR)/[email protected]

# common textures
$(BUILD_DIR)/assets/code/common_data/common_data.o: assets/code/common_data/common_data.c $(TEXTURE_FILES) $(TEXTURE_FILES_TLUT)
@$(PRINT) "$(GREEN)Compiling Common Textures: $(BLUE)$@ $(NO_COL)\n"
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@
$(V)$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@



Expand Down Expand Up @@ -565,7 +568,7 @@ COURSE_GEOGRAPHY_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/cou

# Course vertices and displaylists are included together due to no alignment between the two files.
%/course_geography.mio0.s: %/course_vertices.inc.mio0 %/course_displaylists_packed.inc.bin
$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_vertex\n\n.incbin \"$(@D)/course_vertices.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/course_displaylists_packed.inc.bin\"\n\n.balign 0x10\n" > $@
$(V)$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_vertex\n\n.incbin \"$(@D)/course_vertices.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/course_displaylists_packed.inc.bin\"\n\n.balign 0x10\n" > $@



Expand All @@ -589,29 +592,29 @@ COURSE_DATA_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_d
$(V)$(MIO0TOOL) -c $< $@

%/course_data.mio0.s: %/course_data.mio0
$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@
$(V)$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@


#==============================================================================#
# Source Code Generation #
#==============================================================================#
$(BUILD_DIR)/%.jp.c: %.c
$(call print,Encoding:,$<,$@)
iconv -t EUC-JP -f UTF-8 $< > $@
$(V)iconv -t EUC-JP -f UTF-8 $< > $@

$(BUILD_DIR)/%.o: %.c
$(call print,Compiling:,$<,$@)
$(V)$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@
$(V)$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@

$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c
$(call print,Compiling:,$<,$@)
$(V)$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<

$(BUILD_DIR)/%.o: %.s $(MIO0_FILES) $(RAW_TEXTURE_FILES)
$(AS) $(ASFLAGS) -o $@ $<
$(V)$(AS) $(ASFLAGS) -o $@ $<

$(EUC_JP_FILES:%.c=$(BUILD_DIR)/%.jp.o): CC := $(PYTHON) $(TOOLS_DIR)/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --

Expand Down Expand Up @@ -667,7 +670,7 @@ LDFLAGS += -R $(BUILD_DIR)/assets/code/ceremony_data/ceremony_data.elf
$(V)$(MIO0TOOL) -c $< $@

%/ceremony_data.mio0.s: %/ceremony_data.mio0
$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"$<\"\n\n.balign 16\nglabel ceremonyData_end\n" > $@
$(V)$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"$<\"\n\n.balign 16\nglabel ceremonyData_end\n" > $@


#==============================================================================#
Expand All @@ -687,7 +690,7 @@ LDFLAGS += -R $(BUILD_DIR)/assets/code/startup_logo/startup_logo.elf
$(V)$(MIO0TOOL) -c $< $@

%/startup_logo.mio0.s: %/startup_logo.mio0
$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"$<\"\n\n.balign 16\n\nglabel startupLogo_end\n" > $@
$(V)$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"$<\"\n\n.balign 16\n\nglabel startupLogo_end\n" > $@

#==============================================================================#
# Compile Common Textures #
Expand All @@ -706,7 +709,7 @@ LDFLAGS += -R $(BUILD_DIR)/assets/code/common_data/common_data.elf
$(V)$(MIO0TOOL) -c $< $@

%/common_data.mio0.s: %/common_data.mio0
$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@
$(V)$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@



Expand All @@ -729,13 +732,13 @@ $(ROM): $(ELF)
$(call print,Building ROM:,$<,$@)
$(V)$(OBJCOPY) $(OBJCOPYFLAGS) $< $(@:.z64=.bin) -O binary
$(V)$(N64CKSUM) $(@:.z64=.bin) $@
$(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py
$(V)$(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py

$(BUILD_DIR)/$(TARGET).hex: $(TARGET).z64
xxd $< > $@
$(V)xxd $< > $@

$(BUILD_DIR)/$(TARGET).objdump: $(ELF)
$(OBJDUMP) -D $< > $@
$(V)$(OBJDUMP) -D $< > $@


.PHONY: all clean distclean distclean_assets default diff test load assets
Expand Down
12 changes: 7 additions & 5 deletions assets/include/blueshell.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,23 @@ BLUESHELL_EXPORT_SENTINEL := $(BLUESHELL_DIR)/.export
$(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(BLUESHELL_FRAMES:%.png=%.mio0)

$(BLUESHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

$(BLUESHELL_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUESHELL_PALETTE)
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUESHELL_PALETTE)

$(BUILD_DIR)/src/data/common_textures.o: $(BLUESHELL_PALETTE:%.png=%.inc.c)

$(BLUESHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

$(BLUESHELL_FRAMES) $(BLUESHELL_PALETTE): $(BLUESHELL_EXPORT_SENTINEL) ;

$(BLUESHELL_EXPORT_SENTINEL): $(ASSET_DIR)/blueshell.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_blueshell
distclean_blueshell:
Expand Down
10 changes: 6 additions & 4 deletions assets/include/bomb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,18 @@ BOMB_EXPORT_SENTINEL := $(BOMB_DIR)/.export
$(BUILD_DIR)/src/data/common_textures.o: $(BOMB_FRAMES:%.png=%.inc.c) $(BOMB_PALETTE:%.png=%.inc.c)

$(BOMB_FRAMES:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BOMB_PALETTE)
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BOMB_PALETTE)

$(BOMB_PALETTE:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

$(BOMB_FRAMES) $(BOMB_PALETTE): $(BOMB_EXPORT_SENTINEL) ;

$(BOMB_EXPORT_SENTINEL): $(ASSET_DIR)/bomb.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_bomb
distclean_bomb:
Expand Down
16 changes: 10 additions & 6 deletions assets/include/character_portraits.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,26 @@ $(BUILD_DIR)/src/data/common_textures.o: $(PORTRAIT_PNG:%.png=%.inc.c) $(PORTRAI
$(BUILD_DIR)/src/data/common_textures.o: $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c) $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c)

$(PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/common_tlut_portrait_$*.png
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/common_tlut_portrait_$*.png

$(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SPECIAL_PORTRAIT_PALETTE)
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SPECIAL_PORTRAIT_PALETTE)

$(PORTRAIT_PALETTES:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

$(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

$(PORTRAIT_PNG) $(SPECIAL_PORTRAIT_PNG) $(PORTRAIT_PALETTES) $(SPECIAL_PORTRAIT_PALETTE): $(PORTRAIT_EXPORT_SENTINEL) ;

$(PORTRAIT_EXPORT_SENTINEL): $(ASSET_DIR)/character_portraits.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_character_portraits
distclean_character_portraits:
Expand Down
9 changes: 5 additions & 4 deletions assets/include/character_select/bowser_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ BOWSER_SELECT_EXPORT_SENTINEL := $(BOWSER_SELECT_DIR)/.export
$(BUILD_DIR)/data/course_player_selection.o: $(BOWSER_SELECT_PNG:%.png=%.mio0)

$(BOWSER_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

$(BOWSER_SELECT_PNG:%.png=%.bin) : %.bin : %.png
$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16

$(BOWSER_SELECT_PNG): $(BOWSER_SELECT_EXPORT_SENTINEL) ;

$(BOWSER_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/bowser_select.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_bowser_select
distclean_bowser_select:
Expand Down
9 changes: 5 additions & 4 deletions assets/include/character_select/donkeykong_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ DONKEYKONG_SELECT_EXPORT_SENTINEL := $(DONKEYKONG_SELECT_DIR)/.export
$(BUILD_DIR)/data/course_player_selection.o: $(DONKEYKONG_SELECT_PNG:%.png=%.mio0)

$(DONKEYKONG_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

$(DONKEYKONG_SELECT_PNG:%.png=%.bin) : %.bin : %.png
$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16

$(DONKEYKONG_SELECT_PNG): $(DONKEYKONG_SELECT_EXPORT_SENTINEL) ;

$(DONKEYKONG_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/donkeykong_select.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_donkeykong_select
distclean_donkeykong_select:
Expand Down
9 changes: 5 additions & 4 deletions assets/include/character_select/luigi_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ LUIGI_SELECT_EXPORT_SENTINEL := $(LUIGI_SELECT_DIR)/.export
$(BUILD_DIR)/data/course_player_selection.o: $(LUIGI_SELECT_PNG:%.png=%.mio0)

$(LUIGI_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

$(LUIGI_SELECT_PNG:%.png=%.bin) : %.bin : %.png
$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16

$(LUIGI_SELECT_PNG): $(LUIGI_SELECT_EXPORT_SENTINEL) ;

$(LUIGI_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/luigi_select.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_luigi_select
distclean_luigi_select:
Expand Down
9 changes: 5 additions & 4 deletions assets/include/character_select/mario_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ MARIO_SELECT_EXPORT_SENTINEL := $(MARIO_SELECT_DIR)/.export
$(BUILD_DIR)/data/course_player_selection.o: $(MARIO_SELECT_PNG:%.png=%.mio0)

$(MARIO_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

$(MARIO_SELECT_PNG:%.png=%.bin) : %.bin : %.png
$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16

$(MARIO_SELECT_PNG): $(MARIO_SELECT_EXPORT_SENTINEL) ;

$(MARIO_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/mario_select.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_mario_select
distclean_mario_select:
Expand Down
9 changes: 5 additions & 4 deletions assets/include/character_select/peach_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ PEACH_SELECT_EXPORT_SENTINEL := $(PEACH_SELECT_DIR)/.export
$(BUILD_DIR)/data/course_player_selection.o: $(PEACH_SELECT_PNG:%.png=%.mio0)

$(PEACH_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

$(PEACH_SELECT_PNG:%.png=%.bin) : %.bin : %.png
$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16

$(PEACH_SELECT_PNG): $(PEACH_SELECT_EXPORT_SENTINEL) ;

$(PEACH_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/peach_select.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_peach_select
distclean_peach_select:
Expand Down
9 changes: 5 additions & 4 deletions assets/include/character_select/toad_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ TOAD_SELECT_EXPORT_SENTINEL := $(TOAD_SELECT_DIR)/.export
$(BUILD_DIR)/data/course_player_selection.o: $(TOAD_SELECT_PNG:%.png=%.mio0)

$(TOAD_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(V)$(MIO0TOOL) -c $< $@

$(TOAD_SELECT_PNG:%.png=%.bin) : %.bin : %.png
$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16
@$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16

$(TOAD_SELECT_PNG): $(TOAD_SELECT_EXPORT_SENTINEL) ;

$(TOAD_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/toad_select.json
$(ASSET_EXTRACT) $(BASEROM) $<
$(TOUCH) $@
$(V)$(ASSET_EXTRACT) $(BASEROM) $<
$(V)$(TOUCH) $@

.PHONY: distclean_toad_select
distclean_toad_select:
Expand Down
Loading
Loading