kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pal

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-08 13:16:53 -05:00
parent 359ec6a3a8 fd6a60a4b4
commit 17828dfa4d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -354,15 +354,15 @@ $(FINAL_Z64) : $(UNCOMPRESSED_Z64) $(ELF) $(BK_ROM_COMPRESS)
# TOOLS # TOOLS
# Tool for spliting BK asset sections into and from ROM Bin and transforming certain file types # Tool for spliting BK asset sections into and from ROM Bin and transforming certain file types
$(BK_ASSET_TOOL): $(BK_ASSET_TOOL): tools/bk_asset_tool/Cargo.toml tools/bk_asset_tool/Cargo.lock $(wildcard tools/bk_rom_compressor/src/*.rs)
@$(CD) tools/bk_asset_tool && cargo build --release 2> /dev/null @$(CD) tools/bk_asset_tool && cargo build --release 2> /dev/null
# Tool to compress BK and correct checksums from elf and uncompressed rom # Tool to compress BK and correct checksums from elf and uncompressed rom
$(BK_ROM_COMPRESS): $(BK_ROM_COMPRESS): tools/bk_rom_compressor/Cargo.toml tools/bk_rom_compressor/Cargo.lock $(wildcard tools/bk_rom_compressor/src/comp/*.rs)
@$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_compress 2> /dev/null @$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_compress 2> /dev/null
# Tool to turn compressed BK into uncompressed ROM # Tool to turn compressed BK into uncompressed ROM
$(BK_ROM_DECOMPRESS): $(BK_ROM_DECOMPRESS): tools/bk_rom_compressor/Cargo.toml tools/bk_rom_compressor/Cargo.lock $(wildcard tools/bk_rom_compressor/src/decomp/*.rs)
@$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_decompress 2> /dev/null @$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_decompress 2> /dev/null
clean: clean:
@@ -428,8 +428,7 @@ MAKEFLAGS += -r
.SUFFIXES: .SUFFIXES:
# Phony targets # Phony targets
.PHONY: all clean verify $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS)) \ .PHONY: all clean verify $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS))
$(BK_ASSET_TOOL) $(BK_ROM_COMPRESS) $(BK_ROM_DECOMPRESS)
# Set up pipefail # Set up pipefail