From 70ac8e70c5f6dd5c6958f3c69f4bdc4c58b1594f Mon Sep 17 00:00:00 2001 From: SpaiR Date: Sat, 23 Jan 2021 16:13:52 +0200 Subject: [PATCH] [API] Move sumbodules into separate folder --- .gitmodules | 16 ++++++++-------- .../groovy/imgui/generate/GenerateLibs.groovy | 4 ++-- imgui => include/imgui | 0 imgui-node-editor => include/imgui-node-editor | 0 imnodes => include/imnodes | 0 5 files changed, 10 insertions(+), 10 deletions(-) rename imgui => include/imgui (100%) rename imgui-node-editor => include/imgui-node-editor (100%) rename imnodes => include/imnodes (100%) diff --git a/.gitmodules b/.gitmodules index ccdc9c4..83a2b57 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "imgui"] - path = imgui +[submodule "include/imgui"] + path = include/imgui url = https://github.com/ocornut/imgui -[submodule "imgui-node-editor"] - path = imgui-node-editor - url = https://github.com/thedmd/imgui-node-editor.git -[submodule "imnodes"] - path = imnodes - url = https://github.com/Nelarius/imnodes.git +[submodule "include/imgui-node-editor"] + path = include/imgui-node-editor + url = https://github.com/thedmd/imgui-node-editor +[submodule "include/imnodes"] + path = include/imnodes + url = https://github.com/Nelarius/imnodes diff --git a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy index a01e1c3..f36a11c 100644 --- a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy +++ b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy @@ -39,12 +39,12 @@ class GenerateLibs extends DefaultTask { // Copy ImGui h/cpp files project.copy { CopySpec spec -> - ['imgui', 'imnodes', 'imgui-node-editor'].each { + ['include/imgui', 'include/imnodes', 'include/imgui-node-editor'].each { spec.from(project.rootProject.file(it)) { CopySpec s -> s.include('*.h', '*.cpp', '*.inl') } } if (withFreeType) { - spec.from(project.rootProject.file('imgui/misc/freetype')) { CopySpec it -> it.include('*.h', '*.cpp') } + spec.from(project.rootProject.file('include/imgui/misc/freetype')) { CopySpec it -> it.include('*.h', '*.cpp') } } spec.from(project.rootProject.file('imgui-binding/src/main/native')) diff --git a/imgui b/include/imgui similarity index 100% rename from imgui rename to include/imgui diff --git a/imgui-node-editor b/include/imgui-node-editor similarity index 100% rename from imgui-node-editor rename to include/imgui-node-editor diff --git a/imnodes b/include/imnodes similarity index 100% rename from imnodes rename to include/imnodes