From 14e103833a803cbe6f6827011bfb53ca92a45d58 Mon Sep 17 00:00:00 2001 From: timerix Date: Thu, 12 Oct 2023 14:00:48 +0600 Subject: [PATCH] dependencies moved --- .gitmodules | 10 +++++----- cbuild | 2 +- SDL2 => dependencies/SDL2 | 0 dependencies/imgui | 1 + imgui-node-editor => dependencies/imgui-node-editor | 0 dependencies/imnodes | 1 + dependencies/kerep | 1 + imgui | 1 - imnodes | 1 - kerep | 1 - tasks/clean_additions.sh | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename SDL2 => dependencies/SDL2 (100%) create mode 160000 dependencies/imgui rename imgui-node-editor => dependencies/imgui-node-editor (100%) create mode 160000 dependencies/imnodes create mode 160000 dependencies/kerep delete mode 160000 imgui delete mode 160000 imnodes delete mode 160000 kerep diff --git a/.gitmodules b/.gitmodules index 9577c44..b58552b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,21 +2,21 @@ path = cbuild url = https://github.com/Timerix22/cbuild.git [submodule "kerep"] - path = kerep + path = dependencies/kerep url = https://github.com/Timerix22/kerep.git [submodule "SDL2"] - path = SDL2 + path = dependencies/SDL2 url = https://github.com/Timerix22/SDL.git branch = SDL2 [submodule "imgui"] - path = imgui + path = dependencies/imgui url = https://github.com/Timerix22/imgui.git branch = docking_cbuild [submodule "imgui-node-editor"] - path = imgui-node-editor + path = dependencies/imgui-node-editor url = https://github.com/Timerix22/imgui-node-editor.git branch = develop_cbuild [submodule "imnodes"] - path = imnodes + path = dependencies/imnodes url = https://github.com/Timerix22/imnodes branch = master_cbuild diff --git a/cbuild b/cbuild index e83a7af..60fa8c1 160000 --- a/cbuild +++ b/cbuild @@ -1 +1 @@ -Subproject commit e83a7affefe85ec7573ce7465e543747bbf5d477 +Subproject commit 60fa8c11c2673a10f8afbe37bcea13c9be3317b8 diff --git a/SDL2 b/dependencies/SDL2 similarity index 100% rename from SDL2 rename to dependencies/SDL2 diff --git a/dependencies/imgui b/dependencies/imgui new file mode 160000 index 0000000..109735a --- /dev/null +++ b/dependencies/imgui @@ -0,0 +1 @@ +Subproject commit 109735a0d10c55d95c569bae2aa4c2adbfcf9056 diff --git a/imgui-node-editor b/dependencies/imgui-node-editor similarity index 100% rename from imgui-node-editor rename to dependencies/imgui-node-editor diff --git a/dependencies/imnodes b/dependencies/imnodes new file mode 160000 index 0000000..1bff83f --- /dev/null +++ b/dependencies/imnodes @@ -0,0 +1 @@ +Subproject commit 1bff83fbd0fe749b28df5af6844ec0e036320305 diff --git a/dependencies/kerep b/dependencies/kerep new file mode 160000 index 0000000..53cf987 --- /dev/null +++ b/dependencies/kerep @@ -0,0 +1 @@ +Subproject commit 53cf9875e6785a30b2313cf294acb89061a92713 diff --git a/imgui b/imgui deleted file mode 160000 index 9e12957..0000000 --- a/imgui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9e129571c74f68a954916a3d857a43698df3a51f diff --git a/imnodes b/imnodes deleted file mode 160000 index 3dbb910..0000000 --- a/imnodes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3dbb9105083a9b8dc48bec020198050dba81a4e1 diff --git a/kerep b/kerep deleted file mode 160000 index 64634c2..0000000 --- a/kerep +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 64634c23711c20805da8f6db796bd54ab5b9b630 diff --git a/tasks/clean_additions.sh b/tasks/clean_additions.sh index 3657e49..4c59ad6 100644 --- a/tasks/clean_additions.sh +++ b/tasks/clean_additions.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash -for tmpfile in $(ls .rebuild_*.tmp); do +for tmpfile in $(ls -a | grep -e '\.rebuild.*\.tmp'); do try_delete_dir_or_file "$tmpfile" done try_delete_dir_or_file fonts/generated