diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | build.zig | 4 | ||||
| -rw-r--r-- | glad/include/glad/glad.h | 2 | ||||
| -rw-r--r-- | src/freetype-gl/build.zig | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/glad/include/KHR/khrplatform.h (renamed from glad/include/KHR/khrplatform.h) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/glad/include/glad/gl.h (renamed from glad/include/glad/gl.h) | 0 | ||||
| -rw-r--r-- | vendor/glad/include/glad/glad.h | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/glad/src/gl.c (renamed from glad/src/gl.c) | 0 |
9 files changed, 23 insertions, 5 deletions
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>" > $@ @@ -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 index 01646449c..01646449c 100755..100644 --- a/glad/include/KHR/khrplatform.h +++ b/vendor/glad/include/KHR/khrplatform.h diff --git a/glad/include/glad/gl.h b/vendor/glad/include/glad/gl.h index 8b2c8a8f8..8b2c8a8f8 100755..100644 --- a/glad/include/glad/gl.h +++ b/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 index 840cefc57..840cefc57 100755..100644 --- a/glad/src/gl.c +++ b/vendor/glad/src/gl.c |