From 462d71cbef02ef119fc2aa480b98cfeedde46441 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 10 May 2021 08:54:07 -0700 Subject: Makefile fixes / JUTNameTab (#129) * Makefile: Fix issues with iconv causing it to break under devkitPro / msys The version of iconv included in devkitPro does not have a -o option, so replace it with normal shell redirection. Also, SHIFT-JIS does not have a mapping for ~, so output the Windows CP932 variant instead, which does. See: https://en.wikipedia.org/wiki/Tilde#Unicode_and_Shift_JIS_encoding_of_wave_dash https://en.wikipedia.org/wiki/Code_page_932_(Microsoft_Windows)#Single-byte_character_differences * Update diff configuration -Bbinary doesn't seem to work with my copy of bjdump (it says it can't decode unknown architecture) Cheese things by using expected/ instead of having the user place things manually. * JUTNameTab * J3DPacket / J3DDrawBuffer * format Co-authored-by: lepelog --- asmdiff.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asmdiff.sh') diff --git a/asmdiff.sh b/asmdiff.sh index da48908ebc..44f1c93649 100644 --- a/asmdiff.sh +++ b/asmdiff.sh @@ -1,7 +1,7 @@ #!/bin/bash -OBJDUMP="$DEVKITPPC/bin/powerpc-eabi-objdump -D -bbinary -EB -mpowerpc -M gekko" +OBJDUMP="$DEVKITPPC/bin/powerpc-eabi-objdump -D -EB -mpowerpc -M gekko" OPTIONS="--start-address=$(($1)) --stop-address=$(($2+0x4))" -$OBJDUMP $OPTIONS baserom.dol > baserom.dump -$OBJDUMP $OPTIONS build/dolzel2/main.dol > main.dump +$OBJDUMP $OPTIONS expected/build/dolzel2/main.elf > baserom.dump +$OBJDUMP $OPTIONS build/dolzel2/main.elf > main.dump diff -u baserom.dump main.dump -- cgit v1.2.3