From 45f6b6bcadbab396cd459c697ef478e7898d9856 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Thu, 2 Mar 2023 18:14:47 +0100 Subject: [PATCH] Move libraries to armorcore --- .gitmodules | 6 ------ Libraries/iron | 1 - Libraries/zui | 1 - armorlab/khafile.js | 2 -- armorpaint/khafile.js | 2 -- 5 files changed, 12 deletions(-) delete mode 160000 Libraries/iron delete mode 160000 Libraries/zui diff --git a/.gitmodules b/.gitmodules index 6323f726..09b1a8c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ -[submodule "Libraries/iron"] - path = Libraries/iron - url = https://github.com/armory3d/iron -[submodule "Libraries/zui"] - path = Libraries/zui - url = https://github.com/armory3d/zui [submodule "armorcore"] path = armorcore url = https://github.com/armory3d/armorcore diff --git a/Libraries/iron b/Libraries/iron deleted file mode 160000 index 0f282280..00000000 --- a/Libraries/iron +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f28228090ebc452da3c21bab8bea64f7414ec88 diff --git a/Libraries/zui b/Libraries/zui deleted file mode 160000 index 946848c8..00000000 --- a/Libraries/zui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 946848c8f3a688b889a7b31b06517a03c22238d8 diff --git a/armorlab/khafile.js b/armorlab/khafile.js index 3844307b..4a2e2e20 100644 --- a/armorlab/khafile.js +++ b/armorlab/khafile.js @@ -12,8 +12,6 @@ let project = new Project("ArmorLab"); project.addSources("Sources"); project.addShaders("Shaders/*.glsl", { embed: snapshot }); project.addAssets("Assets/*", { destination: "data/{name}", embed: snapshot }); -project.addLibrary("../../Libraries/iron"); -project.addLibrary("../../Libraries/zui"); project.addLibrary("../../base"); project.addShaders("../armorcore/Shaders/*.glsl", { embed: snapshot }); project.addShaders("../base/Shaders/*.glsl", { embed: snapshot }); diff --git a/armorpaint/khafile.js b/armorpaint/khafile.js index 1c40ea0c..500255e6 100644 --- a/armorpaint/khafile.js +++ b/armorpaint/khafile.js @@ -15,8 +15,6 @@ let project = new Project("ArmorPaint"); project.addSources("Sources"); project.addShaders("Shaders/*.glsl", { embed: snapshot }); project.addAssets("Assets/*", { destination: "data/{name}", embed: snapshot }); -project.addLibrary("../../Libraries/iron"); -project.addLibrary("../../Libraries/zui"); project.addLibrary("../../base"); project.addShaders("../armorcore/Shaders/*.glsl", { embed: snapshot }); project.addShaders("../base/Shaders/*.glsl", { embed: snapshot });