From 81d12bbc041cf4a9849e255b268c7def7c3d205f Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Thu, 15 Oct 2020 15:40:50 -0400 Subject: glfw subproject --- .gitmodules | 6 +++--- meson.build | 3 ++- subprojects/glfw | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) create mode 160000 subprojects/glfw diff --git a/.gitmodules b/.gitmodules index 449bd2c..21a3f68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "subprojects/glfw"] - path = subprojects/glfw - url = https://github.com/glfw/glfw.git [submodule "subprojects/json"] path = subprojects/json url = https://github.com/nlohmann/json.git [submodule "subprojects/glm"] path = subprojects/glm url = https://github.com/g-truc/glm.git +[submodule "subprojects/glfw"] + path = subprojects/glfw + url = https://github.com/glfw/glfw.git diff --git a/meson.build b/meson.build index 3a71591..9d772de 100644 --- a/meson.build +++ b/meson.build @@ -54,7 +54,8 @@ else mauri_deps += [lz4, glm, json, dl] endif -glfw = dependency('glfw3', required: false) +#glfw = dependency('glfw3', required: false) +glfw = cmake.subproject('glfw').dependency('glfw') if glfw.found() mauri_deps += [glfw] diff --git a/subprojects/glfw b/subprojects/glfw new file mode 160000 index 0000000..0ef149c --- /dev/null +++ b/subprojects/glfw @@ -0,0 +1 @@ +Subproject commit 0ef149c8f2451fbc8e866834675a075cfc295b6c -- cgit v1.2.3-101-g0448