From 5ac16f969a16fa7edaad9a101d26ecb849bbe0cb Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 14 Jan 2021 12:49:13 +0000
Subject: [PATCH] ninja tools/Yay0compress

---
 Makefile       |  1 -
 configure.py   |  7 +++++++
 tools/Makefile | 11 -----------
 3 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 tools/Makefile

diff --git a/Makefile b/Makefile
index 91cb2d0fb6..68186410e5 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,6 @@ clean-code:
 	rm -rf $(BUILD_DIR)/src
 
 tools:
-	make -C tools
 
 setup: clean-all submodules tools
 	@make split
diff --git a/configure.py b/configure.py
index dbc4a340cc..a16f00423f 100755
--- a/configure.py
+++ b/configure.py
@@ -122,6 +122,9 @@ async def main():
     cpp = args.cpp or "cpp"
     task_sem = asyncio.Semaphore(8)
 
+    # compile n64splat dependencies
+    await shell("make -C tools/n64splat")
+
     # split assets
     split.main(
         "baserom.z64",
@@ -297,6 +300,10 @@ async def main():
     num_tasks_done = 0
     await asyncio.gather(*tasks)
     print("")
+    n.newline()
+
+    n.rule("cc_modern_exe", command="cc $in -O3 -o $out")
+    n.build("tools/Yay0compress", "cc_modern_exe", "tools/Yay0compress.c")
 
 if __name__ == "__main__":
     asyncio.run(main())
diff --git a/tools/Makefile b/tools/Makefile
deleted file mode 100644
index 0434686cae..0000000000
--- a/tools/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-default: all
-
-all: Yay0compress
-	make -C n64splat
-
-Yay0compress:
-	gcc Yay0compress.c -O3 -o Yay0compress
-
-clean:
-	rm -f Yay0compress
-	make clean -C n64splat