From 9e2ef99d2ecdd6c13612b79809ef5fe112b72ad9 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Fri, 13 Dec 2024 18:54:39 -0800 Subject: Ports over OoT's version config (#1750) * Port over version_config from OoT * extract_text * remove need for calling by python modules * Remove extract audio comment * Newline * pyyaml --- Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ee3150e8d..e3f6dda42 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,6 @@ SCHC := $(PYTHON) tools/buildtools/schc.py SCHC_FLAGS := # Audio tools -AUDIO_EXTRACT := $(PYTHON) tools/audio_extraction.py SAMPLECONV := tools/audio/sampleconv/sampleconv SBC := tools/audio/sbc SFC := tools/audio/sfc @@ -474,6 +473,7 @@ clean: assetclean: $(RM) -r $(EXTRACTED_DIR)/assets $(RM) -r $(EXTRACTED_DIR)/text + $(RM) -r $(EXTRACTED_DIR)/.extracted-assets.json $(RM) -r $(BUILD_DIR)/assets distclean: assetclean clean @@ -489,18 +489,14 @@ venv: setup: $(MAKE) -C tools - $(PYTHON) tools/buildtools/decompress_baserom.py -v $(VERSION) - $(PYTHON) tools/buildtools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom --dmadata-start `cat $(BASEROM_DIR)/dmadata_start.txt` --dmadata-names $(BASEROM_DIR)/dmadata_names.txt - $(PYTHON) tools/buildtools/extract_yars.py $(EXTRACTED_DIR)/baserom -v $(VERSION) - -# TODO this is a temporary rule for testing audio, to be removed -setup-audio: - $(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml + $(PYTHON) tools/decompress_baserom.py -v $(VERSION) + $(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom -v $(VERSION) + $(PYTHON) tools/extract_yars.py $(EXTRACTED_DIR)/baserom -v $(VERSION) assets: $(PYTHON) tools/extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -j$(N_THREADS) -Z Wno-hardcoded-pointer -v $(VERSION) - $(PYTHON) tools/text/msgdis.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION) - $(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml + $(PYTHON) tools/extract_text.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION) + $(PYTHON) tools/extract_audio.py -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml ## Assembly generation disasm: -- cgit v1.2.3