From b3d235c83e89e24e993390a7ad9eed8d5b49259a Mon Sep 17 00:00:00 2001 From: Violin Yanev Date: Thu, 6 Apr 2023 19:47:08 +0200 Subject: [PATCH 1/2] Add ramses logic submodules for ramses 28 --- .gitmodules | 15 +++++++++++++++ external/flatbuffers | 1 + external/glm | 1 + external/google-benchmark | 1 + external/lua | 1 + external/sol | 1 + 6 files changed, 20 insertions(+) create mode 160000 external/flatbuffers create mode 160000 external/glm create mode 160000 external/google-benchmark create mode 160000 external/lua create mode 160000 external/sol diff --git a/.gitmodules b/.gitmodules index 3df086392..891593544 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,9 @@ [submodule "external/googletest"] url = https://github.com/google/googletest.git path = external/googletest +[submodule "external/glm"] + url = https://github.com/g-truc/glm.git + path = external/glm [submodule "external/glslang"] url = https://github.com/KhronosGroup/glslang.git path = external/glslang @@ -28,3 +31,15 @@ [submodule "external/cli11"] url = https://github.com/CLIUtils/CLI11.git path = external/cli11 +[submodule "external/google-benchmark"] + path = external/google-benchmark + url = https://github.com/google/benchmark.git +[submodule "external/flatbuffers"] + path = external/flatbuffers + url = https://github.com/google/flatbuffers.git +[submodule "external/lua"] + path = external/lua + url = https://github.com/lua/lua.git +[submodule "external/sol"] + path = external/sol + url = https://github.com/ThePhD/sol2.git diff --git a/external/flatbuffers b/external/flatbuffers new file mode 160000 index 000000000..6df40a247 --- /dev/null +++ b/external/flatbuffers @@ -0,0 +1 @@ +Subproject commit 6df40a2471737b27271bdd9b900ab5f3aec746c7 diff --git a/external/glm b/external/glm new file mode 160000 index 000000000..13724cfae --- /dev/null +++ b/external/glm @@ -0,0 +1 @@ +Subproject commit 13724cfae64a8b5313d1cabc9a963d2c9dbeda12 diff --git a/external/google-benchmark b/external/google-benchmark new file mode 160000 index 000000000..73d4d5e8d --- /dev/null +++ b/external/google-benchmark @@ -0,0 +1 @@ +Subproject commit 73d4d5e8d6d449fc8663765a42aa8aeeee844489 diff --git a/external/lua b/external/lua new file mode 160000 index 000000000..98194db42 --- /dev/null +++ b/external/lua @@ -0,0 +1 @@ +Subproject commit 98194db4295726069137d13b8d24fca8cbf892b6 diff --git a/external/sol b/external/sol new file mode 160000 index 000000000..288f4f4e7 --- /dev/null +++ b/external/sol @@ -0,0 +1 @@ +Subproject commit 288f4f4e73f379cca56f8eb7840a449adac0acb9 From cd160827f89b9dd47b841e98a3298d7626a1f225 Mon Sep 17 00:00:00 2001 From: Askanaz Torosyan Date: Tue, 2 May 2023 16:55:16 +0200 Subject: [PATCH 2/2] Switched to bmwcarit lua fork to fix iOS build. --- .gitmodules | 2 +- external/lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 891593544..07265f40b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,7 +39,7 @@ url = https://github.com/google/flatbuffers.git [submodule "external/lua"] path = external/lua - url = https://github.com/lua/lua.git + url = https://github.com/bmwcarit/lua.git [submodule "external/sol"] path = external/sol url = https://github.com/ThePhD/sol2.git diff --git a/external/lua b/external/lua index 98194db42..9c3ea1aad 160000 --- a/external/lua +++ b/external/lua @@ -1 +1 @@ -Subproject commit 98194db4295726069137d13b8d24fca8cbf892b6 +Subproject commit 9c3ea1aade414143fa77933103373b32ef78f5f0