luboslenco пре 2 година
родитељ
комит
c4e5cc7d89
2 измењених фајлова са 15 додато и 17 уклоњено
  1. 7 8
      armorlab/khafile.js
  2. 8 9
      armorpaint/khafile.js

+ 7 - 8
armorlab/khafile.js

@@ -15,14 +15,6 @@ project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" });
 project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" });
 project.addAssets("Assets/models/*.onnx", { destination: "data/models/{name}" });
 project.addAssets("Assets/models/LICENSE.txt", { destination: "data/models/LICENSE.txt" });
-
-if (process.platform === "win32") {
-	project.addAssets("../armorcore/Libraries/onnx/win32/*.dll", { destination: "{name}" });
-}
-else if (process.platform === "linux") {
-	project.addAssets("../armorcore/Libraries/onnx/linux/*.so.*", { destination: "{name}" }); // Versioned lib
-}
-
 project.addAssets("Assets/readme/readme.txt", { destination: "{name}" });
 
 if (flags.android) {
@@ -32,6 +24,13 @@ else if (flags.ios) {
 	project.addAssets("Assets/readme/readme_ios.txt", { destination: "{name}" });
 }
 
+if (process.platform === "win32") {
+	project.addAssets("../armorcore/Libraries/onnx/win32/*.dll", { destination: "{name}" });
+}
+else if (process.platform === "linux") {
+	project.addAssets("../armorcore/Libraries/onnx/linux/*.so.*", { destination: "{name}" }); // Versioned lib
+}
+
 if (flags.raytrace) {
 	if (flags.d3d12) {
 		project.addAssets("Assets/readme/readme_dxr.txt", { destination: "{name}" });

+ 8 - 9
armorpaint/khafile.js

@@ -13,6 +13,14 @@ project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets
 project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" });
 project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" });
 project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" });
+project.addAssets("Assets/readme/readme.txt", { destination: "{name}" });
+
+if (flags.android) {
+	project.addAssets("Assets/readme/readme_android.txt", { destination: "{name}" });
+}
+else if (flags.ios) {
+	project.addAssets("Assets/readme/readme_ios.txt", { destination: "{name}" });
+}
 
 if (flags.plugin_embed) {
 	project.addAssets("Assets/plugins/embed/*", { destination: "data/plugins/{name}" });
@@ -26,15 +34,6 @@ if (flags.physics) {
 	project.addAssets("Assets/plugins/wasm/ammo/*", { destination: "data/plugins/{name}" });
 }
 
-project.addAssets("Assets/readme/readme.txt", { destination: "{name}" });
-
-if (flags.android) {
-	project.addAssets("Assets/readme/readme_android.txt", { destination: "{name}" });
-}
-else if (flags.ios) {
-	project.addAssets("Assets/readme/readme_ios.txt", { destination: "{name}" });
-}
-
 if (flags.raytrace) {
 	if (flags.d3d12) {
 		project.addAssets("Assets/readme/readme_dxr.txt", { destination: "{name}" });