falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: use relative paths & fix arm toolchain

This commit is contained in:
alex 2021-08-18 18:10:11 +01:00
parent 49bee8512b
commit 048b166d0c
No known key found for this signature in database
GPG Key ID: E907B20C17C70B03
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tools/arm/cc1 → tools/build/arm/cc1
View File

0
tools/arm/mips-nintendo-nu64-as → tools/build/arm/mips-nintendo-nu64-as
View File

4
tools/build/configure.py
View File

@ -18,7 +18,7 @@ ASFLAGS = "-EB -G 0"
# Paths: # Paths:
ROOT = Path(__file__).parent.parent.parent ROOT = Path(__file__).parent.parent.parent
BUILD_TOOLS = ROOT / "tools" / "build" # directory where this file is (TODO: use relative_to) BUILD_TOOLS = (ROOT / "tools" / "build").relative_to(ROOT)
YAY0_COMPRESS_TOOL = f"{BUILD_TOOLS}/yay0/Yay0compress" YAY0_COMPRESS_TOOL = f"{BUILD_TOOLS}/yay0/Yay0compress"
CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc" CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc"
@ -639,7 +639,7 @@ if __name__ == "__main__":
for version in VERSIONS: for version in VERSIONS:
rom = ROOT / f"ver/{version}/baserom.z64" rom = ROOT / f"ver/{version}/baserom.z64"
print(f"configure: looking for baserom {rom}", end="") print(f"configure: looking for baserom {rom.relative_to(ROOT)}", end="")
if rom.exists(): if rom.exists():
print("...found") print("...found")