diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2020-10-15 15:40:50 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2020-10-15 15:40:50 -0400 |
| commit | 81d12bbc041cf4a9849e255b268c7def7c3d205f (patch) | |
| tree | c4da38ca521b70355c9651d43c48c11769ff0f38 | |
| parent | 816967182c31c7b20e43b9e208b8aafdd8073214 (diff) | |
| download | mauri-81d12bbc041cf4a9849e255b268c7def7c3d205f.tar.gz mauri-81d12bbc041cf4a9849e255b268c7def7c3d205f.tar.bz2 mauri-81d12bbc041cf4a9849e255b268c7def7c3d205f.zip | |
glfw subproject
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | meson.build | 3 | ||||
| m--------- | subprojects/glfw | 0 |
3 files changed, 5 insertions, 4 deletions
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 +Subproject 0ef149c8f2451fbc8e866834675a075cfc295b6 |