From 27f9a70085ab7a2525e650a639087bb6389a278b Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sat, 20 Jun 2020 19:38:55 -0400
Subject: [PATCH] clean nyma zlib building stuff

---
 waterbox/nyma/.gitignore                      |  4 ++++
 waterbox/nyma/build-and-install-zlib.sh       |  5 ++---
 waterbox/nyma/zlib/do-everything-for-waterbox |  2 +-
 waterbox/nyma/zlib/zlib.pc                    | 13 -------------
 4 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 waterbox/nyma/zlib/zlib.pc

diff --git a/waterbox/nyma/.gitignore b/waterbox/nyma/.gitignore
index 677f90725b..2065587bfc 100644
--- a/waterbox/nyma/.gitignore
+++ b/waterbox/nyma/.gitignore
@@ -1,3 +1,7 @@
 # These are already ignored, but for some reason vscode won't pick it up
 # and stop showing me things I don't want to see without this
 /obj
+/zlib/zlib.pc
+/zlib/Makefile
+/zlib/configure.log
+/zlib/libz.a
\ No newline at end of file
diff --git a/waterbox/nyma/build-and-install-zlib.sh b/waterbox/nyma/build-and-install-zlib.sh
index af2c2f7c85..6aabdc724b 100644
--- a/waterbox/nyma/build-and-install-zlib.sh
+++ b/waterbox/nyma/build-and-install-zlib.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
+# we left this here so it could turn into other deps-building if need be
 cd zlib
-./configure-for-waterbox
-make
-./install-for-waterbox
+./do-everything-for-waterbox
diff --git a/waterbox/nyma/zlib/do-everything-for-waterbox b/waterbox/nyma/zlib/do-everything-for-waterbox
index 0e2b351809..885dca0d3f 100644
--- a/waterbox/nyma/zlib/do-everything-for-waterbox
+++ b/waterbox/nyma/zlib/do-everything-for-waterbox
@@ -1,5 +1,5 @@
 #!/bin/sh
 ./configure-for-waterbox
 make clean
-make libz.a
+make -j libz.a
 ./install-for-waterbox
diff --git a/waterbox/nyma/zlib/zlib.pc b/waterbox/nyma/zlib/zlib.pc
deleted file mode 100644
index 6158ffd90d..0000000000
--- a/waterbox/nyma/zlib/zlib.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/mnt/c/Develop/BizHawk/waterbox/sysroot
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-sharedlibdir=${libdir}
-includedir=${prefix}/include
-
-Name: zlib
-Description: zlib compression library
-Version: 1.2.11
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}