From 2dd2978401df02db486e246c9a75ec571a83ea76 Mon Sep 17 00:00:00 2001 From: cadmic Date: Mon, 30 Sep 2024 16:43:23 -0700 Subject: [PATCH] Fix permuter tool paths --- README.md | 2 +- tools/permuter_settings.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2d6495c5..b4f78103 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ Run `tools/decompme.py ` (e.g. `tools/decompme.py src/emulato ### Permuter To import a function for [decomp-permuter](https://github.com/simonlindholm/decomp-permuter), ensure `powerpc-eabi-objdump` binary -is on your `PATH` (for instance by adding `tools/binutils` from this project) and run something like +is on your `PATH` (for instance by adding `build/binutils` from this project) and run something like ```sh path/to/permuter/import.py src/emulator/THPRead.c asm/non_matchings/THPRead/Reader.s diff --git a/tools/permuter_settings.toml b/tools/permuter_settings.toml index ef0dd6ba..a28d4910 100644 --- a/tools/permuter_settings.toml +++ b/tools/permuter_settings.toml @@ -1,6 +1,6 @@ compiler_type = "mwcc" -compiler_command = "wibo tools/mwcc_compiler/GC/1.1/mwcceppc.exe -Cpp_exceptions off -proc gekko -fp hardware -fp_contract on -enum int -align powerpc -nosyspath -RTTI off -str reuse -multibyte -O4,p -inline auto,deferred -nodefaults -msgstyle gcc -Iinclude -Ilibc -c" -assembler_command = "tools/binutils/powerpc-eabi-as -mgekko" +compiler_command = "build/tools/wibo build/compilers/GC/1.1/mwcceppc.exe -Cpp_exceptions off -proc gekko -fp hardware -fp_contract on -enum int -align powerpc -nosyspath -RTTI off -str reuse -multibyte -O4,p -inline auto,deferred -nodefaults -msgstyle gcc -Iinclude -Ilibc -c" +assembler_command = "build/binutils/powerpc-eabi-as -mgekko" asm_prelude_file = "include/macros.inc" [preserve_macros]