From 27f3e8931664d3af455d15897c6718f6aca62ba4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 4 Apr 2022 14:52:47 -0700
Subject: [PATCH] Makefile with task for updating glad

---
 .gitignore                                      |  2 ++
 Makefile                                        | 17 +++++++++++++++++
 build.zig                                       |  4 ++--
 glad/include/glad/glad.h                        |  2 --
 src/freetype-gl/build.zig                       |  2 +-
 {glad => vendor/glad}/include/KHR/khrplatform.h |  0
 {glad => vendor/glad}/include/glad/gl.h         |  0
 vendor/glad/include/glad/glad.h                 |  1 +
 {glad => vendor/glad}/src/gl.c                  |  0
 9 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 glad/include/glad/glad.h
 rename {glad => vendor/glad}/include/KHR/khrplatform.h (100%)
 mode change 100755 => 100644
 rename {glad => vendor/glad}/include/glad/gl.h (100%)
 mode change 100755 => 100644
 create mode 100644 vendor/glad/include/glad/glad.h
 rename {glad => vendor/glad}/src/gl.c (100%)
 mode change 100755 => 100644

diff --git a/.gitignore b/.gitignore
index 5ffab5fc4..57e29445e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 zig-cache/
 zig-out/
 /result*
+
+glad.zip
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..2f77fbc2b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+# glad updates the GLAD loader. To use this, place the generated glad.zip
+# in this directory next to the Makefile, remove vendor/glad and run this target.
+#
+# Generator: https://gen.glad.sh/
+glad: vendor/glad
+.PHONY: glad
+
+vendor/glad: vendor/glad/include/glad/gl.h vendor/glad/include/glad/glad.h
+
+vendor/glad/include/glad/gl.h: glad.zip
+	rm -rf vendor/glad
+	mkdir -p vendor/glad
+	unzip glad.zip -dvendor/glad
+	find vendor/glad -type f -exec touch '{}' +
+
+vendor/glad/include/glad/glad.h: vendor/glad/include/glad/gl.h
+	@echo "#include <glad/gl.h>" > $@
diff --git a/build.zig b/build.zig
index 320ce9a36..2443cd049 100644
--- a/build.zig
+++ b/build.zig
@@ -20,8 +20,8 @@ pub fn build(b: *std.build.Builder) !void {
     try ftgl.link(exe, b, target, mode, .{});
 
     // GLAD
-    exe.addIncludeDir("glad/include/");
-    exe.addCSourceFile("glad/src/gl.c", &.{});
+    exe.addIncludeDir("vendor/glad/include/");
+    exe.addCSourceFile("vendor/glad/src/gl.c", &.{});
 
     const ftlib = try ft.create(b, target, mode, .{});
     ftlib.link(exe);
diff --git a/glad/include/glad/glad.h b/glad/include/glad/glad.h
deleted file mode 100644
index 5aafe2d6c..000000000
--- a/glad/include/glad/glad.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Backwards compatibility
-#include <glad/gl.h>
diff --git a/src/freetype-gl/build.zig b/src/freetype-gl/build.zig
index 9d13af82e..5d6988a6f 100644
--- a/src/freetype-gl/build.zig
+++ b/src/freetype-gl/build.zig
@@ -30,7 +30,7 @@ pub fn link(
     // C files
     ret.addCSourceFiles(srcs, flags.items);
     ret.addIncludeDir(root());
-    ret.addIncludeDir(thisDir() ++ "../../glad/include");
+    ret.addIncludeDir(thisDir() ++ "../../vendor/glad/include");
     ret.linkLibC();
 
     // For config.h
diff --git a/glad/include/KHR/khrplatform.h b/vendor/glad/include/KHR/khrplatform.h
old mode 100755
new mode 100644
similarity index 100%
rename from glad/include/KHR/khrplatform.h
rename to vendor/glad/include/KHR/khrplatform.h
diff --git a/glad/include/glad/gl.h b/vendor/glad/include/glad/gl.h
old mode 100755
new mode 100644
similarity index 100%
rename from glad/include/glad/gl.h
rename to vendor/glad/include/glad/gl.h
diff --git a/vendor/glad/include/glad/glad.h b/vendor/glad/include/glad/glad.h
new file mode 100644
index 000000000..f70d5b73f
--- /dev/null
+++ b/vendor/glad/include/glad/glad.h
@@ -0,0 +1 @@
+#include <glad/gl.h>
diff --git a/glad/src/gl.c b/vendor/glad/src/gl.c
old mode 100755
new mode 100644
similarity index 100%
rename from glad/src/gl.c
rename to vendor/glad/src/gl.c