From 3a58ed970132bc041291178d1c0220182b122b25 Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Sun, 29 Jan 2023 15:32:55 +0100
Subject: [PATCH] xmake: Improve scripts

---
 xmake/actions/compile_shaders.lua | 12 +++++++-----
 xmake/actions/createclass.lua     |  2 +-
 xmake/rules/compile_shaders.lua   |  2 +-
 xmake/rules/embed_resources.lua   |  6 +-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/xmake/actions/compile_shaders.lua b/xmake/actions/compile_shaders.lua
index bd77aa6aa..a81bd7367 100644
--- a/xmake/actions/compile_shaders.lua
+++ b/xmake/actions/compile_shaders.lua
@@ -1,5 +1,4 @@
 task("compile-shaders")
-
 	set_menu({
 		-- Settings menu usage
 		usage = "xmake compile-shaders [options]",
@@ -17,13 +16,16 @@ task("compile-shaders")
 
 		task.run("config", {}, {disable_dump = true})
 
-		local nzsl = path.join(project.required_package("nzsl"):installdir(), "bin", "nzslc")
+		local nzsl = project.required_package("nzsl")
+		local nzslc = path.join(project.required_package("nzsl"):installdir(), "bin", "nzslc")
 
-		local envs
+		local envs = nzsl:get("envs")
 		if is_plat("mingw") then
 			local mingw = toolchain.load("mingw")
 			if mingw and mingw:check() then
-				envs = mingw:runenvs()
+				for name, value in pairs(mingw:runenvs()) do
+					envs[name] = table.join(envs[name] or {}, table.wrap(value))
+				end
 			end
 		end
 
@@ -38,6 +40,6 @@ task("compile-shaders")
 				table.insert(argv, "--benchmark-iteration=" .. option.get("benchmark-iteration"))
 			end
 			table.insert(argv, filepath)
-			os.vrunv(nzsl, argv, { envs = envs })
+			os.vrunv(nzslc, argv, { envs = envs })
 		end
 	end)
diff --git a/xmake/actions/createclass.lua b/xmake/actions/createclass.lua
index 349323a99..4945e201c 100644
--- a/xmake/actions/createclass.lua
+++ b/xmake/actions/createclass.lua
@@ -9,7 +9,7 @@ task("create-class")
 set_menu({
 	-- Settings menu usage
 	usage = "xmake create-class [options] name",
-	description = "Check every file for consistency (can fix some errors)",
+	description = "Helper for class creation",
 	options =
 	{
 		-- Set k mode as key-only bool parameter
diff --git a/xmake/rules/compile_shaders.lua b/xmake/rules/compile_shaders.lua
index b02407a4c..bf64289cf 100644
--- a/xmake/rules/compile_shaders.lua
+++ b/xmake/rules/compile_shaders.lua
@@ -28,7 +28,7 @@ rule("nzsl.compile.shaders")
 				envs = mingw:runenvs()
 			end
 		end
-		
+	
 		batchcmds:vrunv(nzsl, argv, { curdir = ".", envs = envs })
 
 		local outputFile = path.join(path.directory(shaderfile), path.basename(shaderfile) .. ".nzslb.h")
diff --git a/xmake/rules/embed_resources.lua b/xmake/rules/embed_resources.lua
index 58a91e620..74c5d6d7c 100644
--- a/xmake/rules/embed_resources.lua
+++ b/xmake/rules/embed_resources.lua
@@ -2,11 +2,7 @@
 rule("embed.resources")
 	before_build(function (target, opt)
 		import("core.base.option")
-		if xmake.version():ge("2.5.9") then
-			import("utils.progress")
-		elseif not import("utils.progress", { try = true }) then
-			import("private.utils.progress")
-		end
+		import("utils.progress")
 
 		local function GenerateEmbedHeader(filepath, targetpath)
 			local bufferSize = 1024 * 1024