From 9237c661cfd0c5ff0c21aafa6e19459f86084ae3 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 22 Jan 2023 08:42:10 -0800 Subject: [PATCH] rename mwcceppc_patched.exe to mwcceppc_modded.exe for better windows compatibility --- .github/workflows/ok-check.yml | 2 +- Makefile | 2 +- tools/tp.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ok-check.yml b/.github/workflows/ok-check.yml index 8a5509f8627..f2c34464762 100644 --- a/.github/workflows/ok-check.yml +++ b/.github/workflows/ok-check.yml @@ -15,6 +15,6 @@ jobs: with: token: ${{secrets.MY_REPO_PAT}} - name: Copy in dol and compilers - run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && cp tools/mwcc_compiler/2.7/mwcceppc.exe tools/mwcc_compiler/2.7/mwcceppc_patched.exe && chown root /github/home/ + run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && cp tools/mwcc_compiler/2.7/mwcceppc.exe tools/mwcc_compiler/2.7/mwcceppc_modded.exe && chown root /github/home/ - name: Run Make (OK) run: make all rels && ./tp check --rels diff --git a/Makefile b/Makefile index 2cd79d6bfa9..00891539491 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ endif AS := $(DEVKITPPC)/bin/powerpc-eabi-as OBJCOPY := $(DEVKITPPC)/bin/powerpc-eabi-objcopy STRIP := $(DEVKITPPC)/bin/powerpc-eabi-strip -CC := $(WINE) tools/mwcc_compiler/$(MWCC_VERSION)/mwcceppc_patched.exe +CC := $(WINE) tools/mwcc_compiler/$(MWCC_VERSION)/mwcceppc_modded.exe DOLPHIN_LIB_CC := $(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe FRANK_CC := $(WINE) tools/mwcc_compiler/1.2.5e/mwcceppc.exe LD := $(WINE_LD) tools/mwcc_compiler/$(MWCC_VERSION)/mwldeppc.exe diff --git a/tools/tp.py b/tools/tp.py index b268efdd255..a38726f3255 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -247,7 +247,7 @@ def setup(debug: bool, game_path: Path, tools_path: Path): c27_mwcceppc_old = c27.joinpath("mwcceppc.old.exe") c27_mwcceppc_orignal = c27.joinpath("mwcceppc.exe") - c27_mwcceppc_patched = c27.joinpath("mwcceppc_patched.exe") + c27_mwcceppc_patched = c27.joinpath("mwcceppc_modded.exe") def patch_compiler(src: Path, dst: Path, apply: bool): with src.open("rb") as src_file: