From 0929f0e5d832a8c87dfd8b29e6a988bdfd450157 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sun, 19 May 2024 23:36:33 +0200 Subject: [PATCH] mini kmake fixes --- armorforge/Plugins/kfile.js | 2 +- armorlab/Plugins/kfile.js | 2 +- armorpaint/Plugins/kfile.js | 2 +- armorsculpt/Plugins/kfile.js | 2 +- base/Sources/path.ts | 8 ++++---- base/project.js | 27 +++++++++++++-------------- misc/pad/project.js | 4 ++-- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/armorforge/Plugins/kfile.js b/armorforge/Plugins/kfile.js index ab667c0b..580fc5e5 100644 --- a/armorforge/Plugins/kfile.js +++ b/armorforge/Plugins/kfile.js @@ -4,4 +4,4 @@ project.addFile('Sources/**'); project.addDefine('WITH_PLUGIN_EMBED'); -resolve(project); +return project; diff --git a/armorlab/Plugins/kfile.js b/armorlab/Plugins/kfile.js index cdf030f1..12310ab5 100644 --- a/armorlab/Plugins/kfile.js +++ b/armorlab/Plugins/kfile.js @@ -15,5 +15,5 @@ else if (platform === Platform.OSX) { project.addLib('Sources/proc_texsynth/macos/libtexsynth.a'); } -resolve(project); +return project; diff --git a/armorpaint/Plugins/kfile.js b/armorpaint/Plugins/kfile.js index 93106c34..9d96dfc2 100644 --- a/armorpaint/Plugins/kfile.js +++ b/armorpaint/Plugins/kfile.js @@ -5,4 +5,4 @@ let project = new Project('plugins'); project.addDefine('WITH_PLUGIN_EMBED'); project.addDefine('TINYUSDZ_NO_STB_IMAGE_IMPLEMENTATION'); -resolve(project); +return project; diff --git a/armorsculpt/Plugins/kfile.js b/armorsculpt/Plugins/kfile.js index ab667c0b..580fc5e5 100644 --- a/armorsculpt/Plugins/kfile.js +++ b/armorsculpt/Plugins/kfile.js @@ -4,4 +4,4 @@ project.addFile('Sources/**'); project.addDefine('WITH_PLUGIN_EMBED'); -resolve(project); +return project; diff --git a/base/Sources/path.ts b/base/Sources/path.ts index aeef8579..133538ac 100644 --- a/base/Sources/path.ts +++ b/base/Sources/path.ts @@ -41,12 +41,12 @@ function path_to_relative(from: string, to: string): string { break; } } - let base: string = ""; + let p: string = ""; for (let i: i32 = 0; i < a.length; ++i) { - base += ".." + path_sep; + p += ".." + path_sep; } - base += string_array_join(b, path_sep); - return base; + p += string_array_join(b, path_sep); + return p; } function path_normalize(path: string): string { diff --git a/base/project.js b/base/project.js index 53a97384..49bffece 100644 --- a/base/project.js +++ b/base/project.js @@ -1,12 +1,12 @@ let flags = globalThis.flags; -flags.android = process.argv.indexOf("android") >= 0; -flags.ios = process.argv.indexOf("ios") >= 0; -flags.d3d12 = process.argv.indexOf("direct3d12") >= 0; -flags.vulkan = process.argv.indexOf("vulkan") >= 0; -flags.metal = process.argv.indexOf("metal") >= 0; +flags.android = os_argv().indexOf("android") >= 0; +flags.ios = os_argv().indexOf("ios") >= 0; +flags.d3d12 = os_argv().indexOf("direct3d12") >= 0; +flags.vulkan = os_argv().indexOf("vulkan") >= 0; +flags.metal = os_argv().indexOf("metal") >= 0; flags.raytrace = flags.d3d12 || flags.vulkan || flags.metal; -flags.embed = process.argv.indexOf("--embed") >= 0; +flags.embed = os_argv().indexOf("--embed") >= 0; flags.physics = true; flags.voxels = !flags.raytrace && !flags.android && !flags.ios; @@ -20,13 +20,13 @@ flags.with_iron = true; flags.with_zui = true; flags.physics = false; //// -flags.on_c_project_created = async function(c_project, platform, graphics) { +flags.on_c_project_created = function(c_project) { c_project.addDefine("IDLE_SLEEP"); let dir = flags.name.toLowerCase(); if (graphics === "vulkan") { c_project.addDefine("KINC_VKRT"); - await c_project.addProject("../" + dir + "/glsl_to_spirv"); + c_project.addProject("../" + dir + "/glsl_to_spirv"); } if (flags.with_onnx) { @@ -52,7 +52,7 @@ flags.on_c_project_created = async function(c_project, platform, graphics) { } } - await c_project.addProject("../" + dir + "/Plugins"); + c_project.addProject("../" + dir + "/Plugins"); }; let project = new Project("Base"); @@ -101,7 +101,7 @@ if (flags.raytrace) { if (flags.voxels) { project.addDefine("arm_voxels"); - if (process.platform === "win32") { + if (os_platform() === "win32") { project.addShaders("Shaders/voxel_hlsl/*.glsl", { embed: flags.embed, noprocessing: true }); } else { @@ -111,13 +111,12 @@ if (flags.voxels) { let export_version_info = true; if (export_version_info) { - const fs = require("fs"); let dir = "../" + flags.name.toLowerCase() + "/build"; - let sha = require("child_process").execSync(`git log --pretty=format:"%h" -n 1`).toString().substr(1, 7); + let sha = os_exec(`git log --pretty=format:"%h" -n 1`).toString().substr(1, 7); let date = new Date().toISOString().split("T")[0]; let data = `{ "sha": "${sha}", "date": "${date}" }`; - fs.ensureDirSync(dir); - fs.writeFileSync(dir + "/version.json", data); + fs_ensuredir(dir); + fs_writefile(dir + "/version.json", data); // Adds version.json to embed.txt list project.addAssets(dir + "/version.json", { destination: "data/{name}", embed: flags.embed }); } diff --git a/misc/pad/project.js b/misc/pad/project.js index 5d86e4e4..f6ebd607 100644 --- a/misc/pad/project.js +++ b/misc/pad/project.js @@ -7,7 +7,7 @@ flags.with_tinydir = true; flags.with_g2 = true; flags.with_iron = true; flags.with_zui = true; -flags.on_c_project_created = function(c_project, platform, graphics) { +flags.on_c_project_created = function(c_project) { c_project.addDefine('IDLE_SLEEP'); } @@ -18,4 +18,4 @@ project.addShaders(root + "armorcore/Shaders/*.glsl",); project.addAssets(root + "base/Assets/font_mono.ttf", { destination: "data/{name}" }); project.addAssets(root + "base/Assets/text_coloring.json", { destination: "data/{name}" }); -resolve(project); +return project;