From 6291b59a2433a4349dbd51e88290297349130ca6 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Sat, 11 Dec 2021 23:46:36 +0100 Subject: project/vstudio: add rundir handling --- xmake/plugins/project/vstudio/impl/vs201x.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xmake/plugins/project/vstudio/impl/vs201x.lua') diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 3c7d62737..d835a4270 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -32,6 +32,7 @@ import("vs201x_vcxproj") import("vs201x_vcxproj_filters") import("core.cache.memcache") import("core.cache.localcache") +import("private.action.run.make_runenvs") import("private.action.require.install", {alias = "install_requires"}) import("actions.config.configfiles", {alias = "generate_configfiles", rootdir = os.programdir()}) import("actions.config.configheader", {alias = "generate_configheader", rootdir = os.programdir()}) @@ -243,6 +244,9 @@ function _make_targetinfo(mode, arch, target) local linkflags = linker.linkflags(target:kind(), target:sourcekinds(), {target = target}) targetinfo.linkflags = linkflags + -- save execution dir (when executed from VS) + targetinfo.rundir = target:rundir() + -- use mfc? save the mfc runtime kind if target:rule("win.sdk.mfc.shared_app") or target:rule("win.sdk.mfc.shared") then targetinfo.usemfc = "Dynamic" -- cgit v1.3.1 From 0a9fa4f1f43ebde6f12bce1afcb968a5f3e850a6 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Sat, 11 Dec 2021 23:52:06 +0100 Subject: Remove make_runenvs imports (but it would be nice to handle runenvs as well) --- xmake/plugins/project/vstudio/impl/vs201x.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'xmake/plugins/project/vstudio/impl/vs201x.lua') diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index d835a4270..bf76b13dc 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -32,7 +32,6 @@ import("vs201x_vcxproj") import("vs201x_vcxproj_filters") import("core.cache.memcache") import("core.cache.localcache") -import("private.action.run.make_runenvs") import("private.action.require.install", {alias = "install_requires"}) import("actions.config.configfiles", {alias = "generate_configfiles", rootdir = os.programdir()}) import("actions.config.configheader", {alias = "generate_configheader", rootdir = os.programdir()}) -- cgit v1.3.1