diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-03-14 20:51:47 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 10:51:47 +1100 |
| commit | 0c3a48ef94a0c29253c5f1997f6fb79efeade261 (patch) | |
| tree | e250b2b8210bd621c793b55fd77d1a60cc5b940a /tools/asm-differ/diff_settings.py | |
| parent | c833969ea79ba31c3103e25e94ef88098c0287de (diff) | |
Subrepos update (#1208)
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "ae408664a"
upstream:
origin: "https://github.com/simonlindholm/asm-differ"
branch: "main"
commit: "ae408664a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull (merge) tools/fado --force
subrepo:
subdir: "tools/fado"
merged: "8d896ee97"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "8d896ee97"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "dab4addae"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git"
branch: "master"
commit: "dab4addae"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/z64compress --force
subrepo:
subdir: "tools/z64compress"
merged: "43035d97f"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "43035d97f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "23929ec93"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "23929ec93"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* Revert "git subrepo pull tools/z64compress --force"
This reverts commit 2e487b5008c129031ab311a3a7bfd42adeb4916b.
Diffstat (limited to 'tools/asm-differ/diff_settings.py')
| -rw-r--r-- | tools/asm-differ/diff_settings.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/asm-differ/diff_settings.py b/tools/asm-differ/diff_settings.py index 183b96b75..19d67d548 100644 --- a/tools/asm-differ/diff_settings.py +++ b/tools/asm-differ/diff_settings.py @@ -5,7 +5,8 @@ def apply(config, args): config["source_directories"] = ["."] # config["show_line_numbers_default"] = True # config["arch"] = "mips" - # config["map_format"] = "gnu" # gnu or mw - # config["mw_build_dir"] = "build/" # only needed for mw map format + # config["map_format"] = "gnu" # gnu, mw, ms + # config["build_dir"] = "build/" # only needed for mw and ms map format + # config["expected_dir"] = "expected/" # needed for -o # config["makeflags"] = [] # config["objdump_executable"] = "" |