From ace805f5328c2b6d84749df89c0551544c1efd08 Mon Sep 17 00:00:00 2001
From: yuzu <yuzucchii@outlook.com>
Date: Mon, 4 Nov 2024 21:11:05 -0500
Subject: [PATCH] add zlib as a dependency

---
 README.md       | 10 ----------
 build.zig       | 35 +++--------------------------------
 build.zig.zon   |  4 ++++
 install-zlib.sh |  5 -----
 4 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100755 install-zlib.sh

diff --git a/README.md b/README.md
index bc845c0..5d50591 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,3 @@
-
-# commands to run
-```bash
-wget https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
-tar xvf zlib-1.2.13.tar.gz
-rm zlib-1.2.13.tar.gz
-mv zlib-1.2.13 lib/zlib
-```
-or simply run ./install-zlib.sh
-
 # features
 * supports sharding for large bots
 * 100% API coverage, fully typed
diff --git a/build.zig b/build.zig
index a128143..4319005 100644
--- a/build.zig
+++ b/build.zig
@@ -25,13 +25,7 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    const zlib_zig = b.createModule(.{
-        //.name = "zlib",
-        .target = target,
-        .optimize = optimize,
-        .root_source_file = b.path("zlib.zig"),
-        .link_libc = true,
-    });
+    const zlib = b.dependency("zlib", .{});
 
     const zmpl = b.dependency("zmpl", .{
         .target = target,
@@ -51,41 +45,18 @@ pub fn build(b: *std.Build) void {
         .link_libc = true,
     });
 
-    const srcs = &.{
-        "lib/zlib/adler32.c",
-        "lib/zlib/compress.c",
-        "lib/zlib/crc32.c",
-        "lib/zlib/deflate.c",
-        "lib/zlib/gzclose.c",
-        "lib/zlib/gzlib.c",
-        "lib/zlib/gzread.c",
-        "lib/zlib/gzwrite.c",
-        "lib/zlib/inflate.c",
-        "lib/zlib/infback.c",
-        "lib/zlib/inftrees.c",
-        "lib/zlib/inffast.c",
-        "lib/zlib/trees.c",
-        "lib/zlib/uncompr.c",
-        "lib/zlib/zutil.c",
-    };
-
-    //const mode = b.standardReleaseOptions();
-
-    zlib_zig.addCSourceFiles(.{ .files = srcs, .flags = &.{"-std=c89"} });
-    zlib_zig.addIncludePath(b.path("lib/zlib/"));
-
     // now install your own executable after it's built correctly
 
     dzig.addImport("ws", websocket.module("websocket"));
     dzig.addImport("tls12", zig_tls.module("zig-tls12"));
-    dzig.addImport("zlib", zlib_zig);
+    dzig.addImport("zlib", zlib.module("zlib"));
     dzig.addImport("zmpl", zmpl.module("zmpl"));
     dzig.addImport("deque", deque.module("zig-deque"));
 
     marin.root_module.addImport("discord.zig", dzig);
     marin.root_module.addImport("ws", websocket.module("websocket"));
     marin.root_module.addImport("tls12", zig_tls.module("zig-tls12"));
-    marin.root_module.addImport("zlib", zlib_zig);
+    marin.root_module.addImport("zlib", zlib.module("zlib"));
     marin.root_module.addImport("zmpl", zmpl.module("zmpl"));
     marin.root_module.addImport("deque", deque.module("zig-deque"));
 
diff --git a/build.zig.zon b/build.zig.zon
index 1b14f3d..c9c5e4f 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -39,6 +39,10 @@
             .url = "https://github.com/yuzudev/websocket.zig/archive/refs/heads/master.zip",
             .hash = "122062d9dda015ba25780d00697e0e2c1cbc3ffa5b5eae55c9ea28b39b6d99ef1d85",
         },
+        .zlib = .{
+            .url = "https://github.com/yuzudev/zig-zlib/archive/refs/heads/main.zip",
+            .hash = "1220cd041e8d04f1da9d6f46d0438f4e6809b113ba3454fffdaae96b59d2b35a6b2b",
+        },
     },
     .paths = .{
         "build.zig",
diff --git a/install-zlib.sh b/install-zlib.sh
deleted file mode 100755
index 32f96d2..0000000
--- a/install-zlib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-wget https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
-tar xvf zlib-1.2.13.tar.gz
-rm zlib-1.2.13.tar.gz
-mv zlib-1.2.13 zlib
-mv zlib lib/zlib