From cad187038cff4542bebbe7a00d6fd96a1741b0fd Mon Sep 17 00:00:00 2001 From: ouczbs Date: Thu, 28 Nov 2024 22:12:11 +0800 Subject: [PATCH] update editor --- engine/3rdparty/xmake.lua | 2 +- engine/xmake/rule_api/package_api.lua | 2 +- engine/xmake/rule_plugin/make_plugin.lua | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/3rdparty/xmake.lua b/engine/3rdparty/xmake.lua index e49a569..dc2449e 100644 --- a/engine/3rdparty/xmake.lua +++ b/engine/3rdparty/xmake.lua @@ -1,4 +1,4 @@ add_requires("spdlog", "lemon", "libsdl", "vulkansdk","shaderc","spirv","spirv-cross") add_requires("mimalloc", {configs = {shared = true, debug = true, copy = true}}) -add_requires("imgui",{configs = { shared = false, debug = true, copy = true}}) +add_requires("imgui") includes("*/xmake.lua") \ No newline at end of file diff --git a/engine/xmake/rule_api/package_api.lua b/engine/xmake/rule_api/package_api.lua index b77eae0..ef7ea56 100644 --- a/engine/xmake/rule_api/package_api.lua +++ b/engine/xmake/rule_api/package_api.lua @@ -5,7 +5,7 @@ function main(target) local link = pkg:get("links") local targetdir = target:targetdir() link = link[1] or link - if link and not os.isfile(path.join(targetdir, link .. ".lib")) then + if link and os.isdir(targetdir) and not os.isfile(path.join(targetdir, link .. ".lib")) then local linkdirs = pkg:get("linkdirs") os.trycp(linkdirs.."/*", targetdir) print("copy",linkdirs, targetdir) diff --git a/engine/xmake/rule_plugin/make_plugin.lua b/engine/xmake/rule_plugin/make_plugin.lua index 5bcc418..0da0ed4 100644 --- a/engine/xmake/rule_plugin/make_plugin.lua +++ b/engine/xmake/rule_plugin/make_plugin.lua @@ -32,6 +32,9 @@ function add_gen_dir(target) return sourcedir end function main(target, file) + if true then + return + end local sourcedir = add_gen_dir(target) local genfile = path.join(sourcedir, target:name() .. ".plugin.inl") local dependfile = target:dependfile(genfile)