From dc20524e2d8c32c4157cd06d975462a87b2c1e07 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 9 Mar 2021 23:39:12 -0500 Subject: [PATCH] Fix permuter (2) (#204) * Wrap __asm__ for macro inclusion in a dummy function for the permuter * -DPERMUTER --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 687942439c..9a34585143 100755 --- a/configure.py +++ b/configure.py @@ -260,7 +260,7 @@ async def main(): with open("tools/permuter_settings.toml", "w") as f: version = versions[0] - f.write(f"compiler_command = \"{cpp} -Iver/{version}/build/include -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -D VERSION={version} -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 {args.cflags} -D SCRIPT(...)={{}} | {iconv} | tools/{os_dir}/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow {args.cflags} -o - | tools/{os_dir}/mips-nintendo-nu64-as -EB -G 0 -\"\n") + f.write(f"compiler_command = \"{cpp} -Iver/{version}/build/include -Iinclude -Isrc -DPERMUTER -D _LANGUAGE_C -D _FINALROM -D VERSION={version} -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 {args.cflags} -D SCRIPT(...)={{}} | {iconv} | tools/{os_dir}/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow {args.cflags} -o - | tools/{os_dir}/mips-nintendo-nu64-as -EB -G 0 -\"\n") f.write(f"assembler_command = \"{cross}as -march=vr4300 -mabi=32\"\n") # $version