From 46c7b95f9a14a807055dbc800b9cc49bf659b6fb Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Mon, 16 Oct 2023 06:17:33 -0300 Subject: [PATCH] $(PYTHON) --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 27dbb172..26984876 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,8 @@ TARGET := starfox64 ### Output ### BUILD_DIR := build +TOOLS := tools +PYTHON := python3 ROM := $(BUILD_DIR)/$(TARGET).$(VERSION).uncompressed.z64 ROMC := $(BUILD_DIR)/$(TARGET).$(VERSION).z64 ELF := $(BUILD_DIR)/$(TARGET).$(VERSION).elf @@ -80,24 +82,23 @@ endif ### Compiler ### -CC := tools/ido_recomp/$(DETECTED_OS)/5.3/cc +CC := $(TOOLS)/ido_recomp/$(DETECTED_OS)/5.3/cc AS := $(MIPS_BINUTILS_PREFIX)as LD := $(MIPS_BINUTILS_PREFIX)ld OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump CPP := cpp ICONV := iconv -ASM_PROC := python3 tools/asm-processor/build.py +ASM_PROC := $(PYTHON) $(TOOLS)/asm-processor/build.py CAT := cat ASM_PROC_FLAGS := --input-enc=utf-8 --output-enc=euc-jp --convert-statics=global-with-filename -SPLAT ?= tools/splat/split.py +SPLAT ?= $(TOOLS)/splat/split.py SPLAT_YAML ?= $(TARGET).$(VERSION).yaml -COMPTOOL := tools/comptool.py +COMPTOOL := $(TOOLS)/comptool.py -PYTHON := python3 IINC := -Iinclude -Ibin/$(VERSION) -I. IINC += -Ilib/ultralib/include -Ilib/ultralib/include/PR -Ilib/ultralib/include/ido @@ -232,10 +233,10 @@ clean: @git clean -fdx linker_scripts/ format: - @./tools/format.py -j $(nproc) + @$(TOOLS)/format.py -j $(nproc) checkformat: - @./tools/check_format.sh -j $(nproc) + @$(TOOLS)/check_format.sh -j $(nproc) # asm-differ expected object files expected: