Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 02:24:01 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Makefile Quality of Life Changes (#1275)

Browse Source 
The `check` recipe now has dependencies on all of the files it checks
allowing them to be rebuilt if necessary.

Consistent use of `dd` and suppressing `dd`'s output which noise for the
replacement and padding it's doing.

Run 7z in non-interactive mode to avoid confirming overwrite of files
during extraction (equivalent behavior to `VERSION=us` `extract_disk`).

`patch` is a phony target.

Co-authored-by: Jonathan Hohle <jon@ttkb.co>
This commit is contained in:
Jonathan Hohle 2024-06-08 10:13:03 -07:00 committed by GitHub
parent 93cadd8077
commit 4dff513033
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -107,6 +107,8 @@ endef
SOTNDISK_SOURCES := $(shell find tools/sotn-disk -name '*.go')
CHECK_FILES := $(shell cut -d' ' -f3 config/check.$(VERSION).sha)
.PHONY: build
all: build check
@ -147,8 +149,8 @@ format: bin/clang-format
./tools/symbols.py remove-orphans config/splat.us.stmad.yaml
patch:
$(DIRT_PATCHER) config/dirt.$(VERSION).json
check: patch
sha1sum --check config/check.$(VERSION).sha
check: config/check.$(VERSION).sha patch $(CHECK_FILES)
sha1sum --check $<
expected: check
mkdir -p expected/build
rm -rf expected/build/$(VERSION)
@ -241,7 +243,7 @@ $(BUILD_DIR)/tt_000_raw.bin: $(BUILD_DIR)/tt_000.elf
$(OBJCOPY) -O binary $< $@
$(BUILD_DIR)/TT_000.BIN: $(BUILD_DIR)/tt_000_raw.bin
cp $< $@
dd if=/dev/zero bs=1 count=$$((40960 - $$(stat -c %s $<))) >> $@
dd status=none if=/dev/zero bs=1 count=$$((40960 - $$(stat -c %s $<))) >> $@
mad_fix: stmad_dirs $$(call list_o_files,st/mad) $$(call list_o_files,st)
$(LD) $(LD_FLAGS) -o $(BUILD_DIR)/stmad_fix.elf \
@ -284,7 +286,7 @@ $(BUILD_DIR)/weapon/f%.bin: $(BUILD_DIR)/weapon/f%.elf
$(OBJCOPY) -O binary $< $@
$(BUILD_DIR)/weapon/w%.bin: $(BUILD_DIR)/weapon/w%.elf
$(OBJCOPY) -O binary $< $@
printf '\x00' | dd of=$@ bs=1 seek=12287 count=1 conv=notrunc
dd status=none if=/dev/zero of=$@ bs=1 seek=12287 count=1 conv=notrunc
$(ASM_DIR)/weapon/data/w_%.data.s: # create a fake empty file if all the data has been imported
touch $@
$(ASM_DIR)/weapon/data/w_%.sbss.s: # create a fake empty file if all the bss section has been imported
@ -396,7 +398,7 @@ disk_debug: disk_prepare
# put this here as both PSX HD and PSP use it
extract_disk_psp%:
mkdir -p disks/psp$*
7z x disks/sotn.psp$*.iso -odisks/psp$*/
7z x -y disks/sotn.psp$*.iso -odisks/psp$*/
update-dependencies: $(SPLAT_APP) $(ASMDIFFER_APP) $(M2CTX_APP) $(M2C_APP) $(MASPSX_APP) $(SATURN_SPLITTER_APP) $(GO)
cd $(SATURN_SPLITTER_DIR)/rust-dis && cargo build --release
@ -477,7 +479,7 @@ SHELL = /bin/bash -e -o pipefail
include tools/tools.mk
.PHONY: all, clean, format, check, build, expected
.PHONY: all, clean, format, patch, check, build, expected
.PHONY: main, dra, ric, cen, dre, mad, no3, np3, nz0, st0, wrp, rwrp, tt_000
.PHONY: %_dirs
.PHONY: extract, extract_%