Просмотр исходного кода

Add “update = merge” and “upstream” entries for submodules.

wip/kinc
Sam Hocevar 5 лет назад
Родитель
Сommit
28938c8ee6
2 измененных файлов: 21 добавлений и 7 удалений
  1. +20
    -6
      .gitmodules
  2. +1
    -1
      lol

+ 20
- 6
.gitmodules Просмотреть файл

@@ -1,28 +1,42 @@
# The “lol” header-only framework
[submodule "lol"]
path = lol
url = https://github.com/lolengine/lol.git
url = https://github.com/lolengine/lol
branch = master
update = merge

# A very large repository with Windows binaries
[submodule "external"]
path = external
url = https://gitea.zoy.org/lolengine/binaries.git
url = https://gitea.zoy.org/lolengine/binaries
branch = master
update = merge

# Some libraries we embed in the engine
[submodule "imgui"]
path = src/3rdparty/imgui
url = ../../lolengine/ext-imgui.git
url = https://github.com/lolengine/ext-imgui
branch = master
update = merge
upstream = https://github.com/ocornut/imgui

[submodule "bullet3"]
path = src/3rdparty/bullet3
url = ../../lolengine/ext-bullet3.git
url = https://github.com/lolengine/ext-bullet3
branch = lol
update = merge
upstream = https://github.com/bulletphysics/bullet3

[submodule "lua"]
path = src/3rdparty/lua
url = ../../lolengine/ext-lua.git
url = https://github.com/lolengine/ext-lua
branch = lol
update = merge
upstream = https://github.com/lua/lua

[submodule "cpp-httplib"]
path = src/3rdparty/cpp-httplib
url = ../../lolengine/ext-cpp-httplib.git
url = https://github.com/lolengine/ext-cpp-httplib
branch = master
update = merge
upstream = https://github.com/yhirose/cpp-httplib

+ 1
- 1
lol

@@ -1 +1 @@
Subproject commit 46f0426adeac4d9aadde1aacccce552f16590c14
Subproject commit 2ff9562bacfe192da450fd82727406bcd48200f5

Загрузка…
Отмена
Сохранить