From 26f07442a545f91cd7b8beedbd1452be943a9706 Mon Sep 17 00:00:00 2001
From: Richard Goedeken <Richard@fascinationsoftware.com>
Date: Wed, 25 Mar 2020 19:21:30 -0700
Subject: [PATCH] create new tools folder and move ulz source code there

---
 .gitignore                             | 3 ++-
 build_ram.sh                           | 2 +-
 build_rom.py                           | 6 +++---
 {ulz => tools/ulz-encoder}/LICENSE     | 0
 {ulz => tools/ulz-encoder}/README.md   | 0
 {ulz => tools/ulz-encoder}/src/ulz.cpp | 0
 {ulz => tools/ulz-encoder}/src/ulz.hpp | 0
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename {ulz => tools/ulz-encoder}/LICENSE (100%)
 rename {ulz => tools/ulz-encoder}/README.md (100%)
 rename {ulz => tools/ulz-encoder}/src/ulz.cpp (100%)
 rename {ulz => tools/ulz-encoder}/src/ulz.hpp (100%)

diff --git a/.gitignore b/.gitignore
index 117145f..cc243c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ adventureland.bin
 adv_rom_loader.bin
 mcsmp20r_final.bin
 releases/*
-ulz/ulz
+tools/ulz
+tools/a18
diff --git a/build_ram.sh b/build_ram.sh
index 81e6151..3240b86 100755
--- a/build_ram.sh
+++ b/build_ram.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-../../A18/a18 game_ram.asm -l adventureland.prn -o adventureland.hex -b adventureland.bin
+./tools/a18 game_ram.asm -l adventureland.prn -o adventureland.hex -b adventureland.bin
 
diff --git a/build_rom.py b/build_rom.py
index 7dfbd95..7c8ecac 100755
--- a/build_rom.py
+++ b/build_rom.py
@@ -3,12 +3,12 @@
 import os
 import sys
 
-TOOLDIR = "../../"
+TOOLDIR = "./tools"
 
 if __name__ == "__main__":
     # Initialize tool paths
-    a18Path = os.path.join(TOOLDIR, "A18", "a18")
-    ulzPath = os.path.join(TOOLDIR, "ulz", "ulz")
+    a18Path = os.path.join(TOOLDIR, "a18")
+    ulzPath = os.path.join(TOOLDIR, "ulz")
     # Step 1: assemble game core
     cmd = "%s game_rom_core.asm -l adventureland.prn -b adventureland.bin" % a18Path
     print(cmd)
diff --git a/ulz/LICENSE b/tools/ulz-encoder/LICENSE
similarity index 100%
rename from ulz/LICENSE
rename to tools/ulz-encoder/LICENSE
diff --git a/ulz/README.md b/tools/ulz-encoder/README.md
similarity index 100%
rename from ulz/README.md
rename to tools/ulz-encoder/README.md
diff --git a/ulz/src/ulz.cpp b/tools/ulz-encoder/src/ulz.cpp
similarity index 100%
rename from ulz/src/ulz.cpp
rename to tools/ulz-encoder/src/ulz.cpp
diff --git a/ulz/src/ulz.hpp b/tools/ulz-encoder/src/ulz.hpp
similarity index 100%
rename from ulz/src/ulz.hpp
rename to tools/ulz-encoder/src/ulz.hpp