mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-29 00:06:33 +00:00
Name asset extraction tools more consistently (#2316)
This commit is contained in:
parent
3a07abbfac
commit
b2d3c0523d
4 changed files with 4 additions and 9 deletions
11
Makefile
11
Makefile
|
@ -235,7 +235,6 @@ PYTHON ?= $(VENV)/bin/python3
|
||||||
BUILD_DIR_REPLACE := sed -e 's|$$(BUILD_DIR)|$(BUILD_DIR)|g'
|
BUILD_DIR_REPLACE := sed -e 's|$$(BUILD_DIR)|$(BUILD_DIR)|g'
|
||||||
|
|
||||||
# Audio tools
|
# Audio tools
|
||||||
AUDIO_EXTRACT := $(PYTHON) tools/audio_extraction.py
|
|
||||||
SAMPLECONV := tools/audio/sampleconv/sampleconv
|
SAMPLECONV := tools/audio/sampleconv/sampleconv
|
||||||
SBC := tools/audio/sbc
|
SBC := tools/audio/sbc
|
||||||
SFC := tools/audio/sfc
|
SFC := tools/audio/sfc
|
||||||
|
@ -599,18 +598,14 @@ venv:
|
||||||
$(PYTHON) -m pip install -U pip
|
$(PYTHON) -m pip install -U pip
|
||||||
$(PYTHON) -m pip install -U -r requirements.txt
|
$(PYTHON) -m pip install -U -r requirements.txt
|
||||||
|
|
||||||
# TODO this is a temporary rule for testing audio, to be removed
|
|
||||||
setup-audio:
|
|
||||||
$(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml
|
|
||||||
|
|
||||||
setup: venv
|
setup: venv
|
||||||
$(MAKE) -C tools
|
$(MAKE) -C tools
|
||||||
$(PYTHON) tools/decompress_baserom.py $(VERSION)
|
$(PYTHON) tools/decompress_baserom.py $(VERSION)
|
||||||
$(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom -v $(VERSION)
|
$(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom -v $(VERSION)
|
||||||
$(PYTHON) tools/extract_incbins.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/incbin -v $(VERSION)
|
$(PYTHON) tools/extract_incbins.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/incbin -v $(VERSION)
|
||||||
$(PYTHON) tools/msgdis.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION)
|
$(PYTHON) tools/extract_text.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION)
|
||||||
$(PYTHON) extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -v $(VERSION) -j$(N_THREADS)
|
$(PYTHON) tools/extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -v $(VERSION) -j$(N_THREADS)
|
||||||
$(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml
|
$(PYTHON) tools/extract_audio.py -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml
|
||||||
|
|
||||||
disasm:
|
disasm:
|
||||||
$(RM) -r $(EXPECTED_DIR)
|
$(RM) -r $(EXPECTED_DIR)
|
||||||
|
|
|
@ -8,7 +8,7 @@ import time
|
||||||
import multiprocessing
|
import multiprocessing
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from tools import version_config
|
import version_config
|
||||||
|
|
||||||
|
|
||||||
def SignalHandler(sig, frame):
|
def SignalHandler(sig, frame):
|
Loading…
Reference in a new issue