From 214d4cfd6a5402b720d83f033056423c0b5655dc Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 11 Jun 2022 11:54:53 -0700 Subject: [PATCH] glfw: upgrade to GLFW@master; add upstream submodule https://github.com/hexops/glfw This upgrades us to the latest master (pre-release) version of GLFW which has our patches for undefined behavior in Zig, effectively moving us off of our temporary fork. We now track GLFW upstream at the revision documented in https://github.com/hexops/glfw/blob/main/VERSION Signed-off-by: Stephen Gutekanst Co-authored-by: Cai Bingjun <1945458160@qq.com> --- .gitmodules | 3 +++ glfw/.gitmodules | 4 ++++ glfw/upstream | 1 + 3 files changed, 8 insertions(+) create mode 100644 glfw/.gitmodules create mode 160000 glfw/upstream diff --git a/.gitmodules b/.gitmodules index 69251ecb..424eb810 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "tools/libs/apple_pie"] path = tools/libs/apple_pie url = https://github.com/Luukdegram/apple_pie +[submodule "glfw/upstream"] + path = glfw/upstream + url = https://github.com/hexops/glfw diff --git a/glfw/.gitmodules b/glfw/.gitmodules new file mode 100644 index 00000000..bd2b0a89 --- /dev/null +++ b/glfw/.gitmodules @@ -0,0 +1,4 @@ +[submodule "glfw/upstream"] + path = glfw/upstream + url = https://github.com/hexops/glfw + diff --git a/glfw/upstream b/glfw/upstream new file mode 160000 index 00000000..daa69f32 --- /dev/null +++ b/glfw/upstream @@ -0,0 +1 @@ +Subproject commit daa69f32e9a8ec20492b24d79b9243cb7ddf1aa8