From b450037c1fecf82c44d06874483748ad896c4125 Mon Sep 17 00:00:00 2001 From: Mark Langen Date: Sun, 22 Nov 2020 23:49:06 -0800 Subject: [PATCH 1/2] Fix python tooling bits * Invoke python via "py -3" command instead of "python" to avoid python version issues for systems with multiple python versions installed. * Add .pyc to the gitignore so that cached python files aren't picked up by git. --- .gitignore | 1 + Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a9f223ed..0aaa60872 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ __pycache__ +*.pyc tools/mwcc_compiler/*.* tools/elf2dol *.asm diff --git a/Makefile b/Makefile index 89f0ad841..849afb8c1 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,8 @@ AS := $(DEVKITPPC)/bin/powerpc-eabi-as OBJCOPY := $(DEVKITPPC)/bin/powerpc-eabi-objcopy CC := $(WINE) tools/mwcc_compiler/2.0/mwcceppc.exe LD := $(WINE) tools/mwcc_compiler/2.7/mwldeppc.exe -PPROC := python tools/postprocess.py -GLBLASM := python tools/inlineasm/globalasm.py +PPROC := py -3 tools/postprocess.py +GLBLASM := py -3 tools/inlineasm/globalasm.py ELF2DOL := tools/elf2dol SHA1SUM := sha1sum ASMDIFF := ./asmdiff.sh From 8a0becad41418a0c13f3140fe8cb565720a7d9b3 Mon Sep 17 00:00:00 2001 From: Mark Langen Date: Mon, 23 Nov 2020 22:46:43 -0800 Subject: [PATCH 2/2] Use python3 instead * Apparently using py -3 is not a good idea, because it isn't part of the path by default. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 849afb8c1..68104037d 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,8 @@ AS := $(DEVKITPPC)/bin/powerpc-eabi-as OBJCOPY := $(DEVKITPPC)/bin/powerpc-eabi-objcopy CC := $(WINE) tools/mwcc_compiler/2.0/mwcceppc.exe LD := $(WINE) tools/mwcc_compiler/2.7/mwldeppc.exe -PPROC := py -3 tools/postprocess.py -GLBLASM := py -3 tools/inlineasm/globalasm.py +PPROC := python3 tools/postprocess.py +GLBLASM := python3 tools/inlineasm/globalasm.py ELF2DOL := tools/elf2dol SHA1SUM := sha1sum ASMDIFF := ./asmdiff.sh