summaryrefslogtreecommitdiff
path: root/diff_settings.py
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2021-05-10 08:54:07 -0700
committerGitHub <noreply@github.com>2021-05-10 11:54:07 -0400
commit462d71cbef02ef119fc2aa480b98cfeedde46441 (patch)
tree923ed9f6f939c3e4b64dba0070e1539d05910089 /diff_settings.py
parent9799fadfe84344fa3ea78835365570d832a476c7 (diff)
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 <lepelog@users.noreply.github.com>
Diffstat (limited to 'diff_settings.py')
-rw-r--r--diff_settings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff_settings.py b/diff_settings.py
index 3e81148936..c9d96b0bcf 100644
--- a/diff_settings.py
+++ b/diff_settings.py
@@ -9,7 +9,7 @@ def apply(config, args):
config['build_dir'] = "build/" # only needed for mw map format
config['expected_build_dir'] = 'expected/build/'
config['myimg'] = 'build/dolzel2/main.elf'
- config['baseimg'] = 'baserom.elf'
+ config['baseimg'] = 'expected/build/dolzel2/main.elf'
config['makeflags'] = []
if args.source:
config['makeflags'].append('DEBUG=1')