From b6904aa2cc756e1b553d65cce2f04410d21d0210 Mon Sep 17 00:00:00 2001
From: Anghelo Carvajal <angheloalf95@gmail.com>
Date: Mon, 7 Jun 2021 18:31:56 -0400
Subject: Convert every submodule into subrepo (#170)

* remove ZAPD submodule

* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "ca229f19"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "ca229f19"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "1e4b85a7"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "1e4b85a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Remove asm-differ

* git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "eaf72269"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "master"
  commit:   "eaf72269"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove asm-processor

* git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "85288fcd"
upstream:
  origin:   "https://github.com/simonlindholm/asm-processor.git"
  branch:   "master"
  commit:   "85288fcd"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove .gitmodules file

* Update REAMDE

* Update warnings
---
 tools/asm-differ                  |  1 -
 tools/asm-differ/diff_settings.py | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 delete mode 160000 tools/asm-differ
 create mode 100644 tools/asm-differ/diff_settings.py

(limited to 'tools/asm-differ/diff_settings.py')

diff --git a/tools/asm-differ b/tools/asm-differ
deleted file mode 160000
index 9d79eb9f5..000000000
--- a/tools/asm-differ
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9d79eb9f539e5fa58fe63c62862661c5d9ce0d27
diff --git a/tools/asm-differ/diff_settings.py b/tools/asm-differ/diff_settings.py
new file mode 100644
index 000000000..0c4e65005
--- /dev/null
+++ b/tools/asm-differ/diff_settings.py
@@ -0,0 +1,10 @@
+def apply(config, args):
+    config["baseimg"] = "target.bin"
+    config["myimg"] = "source.bin"
+    config["mapfile"] = "build.map"
+    config["source_directories"] = ["."]
+    #config["arch"] = "mips"
+    #config["map_format"] = "gnu" # gnu or mw
+    #config["mw_build_dir"] = "build/" # only needed for mw map format
+    #config["makeflags"] = []
+    #config["objdump_executable"] = ""
-- 
cgit v1.2.3