summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-03-18 00:54:35 +0800
committerruki <[email protected]>2021-03-18 00:54:35 +0800
commit9e02f32de0afd0079d8137e58f679652d34010be (patch)
tree967fa10db081d7bbd754b2d46688fe3be445b602
parent57bf66724d0e9ef988a4020f2686230c48453431 (diff)
fix vsxmake with config flags
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua18
1 files changed, 9 insertions, 9 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index 396b7def3..8ef1f8fa5 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -175,15 +175,6 @@ function _make_targetinfo(mode, arch, target)
targetinfo.subsystem = "console"
end
- -- save config flags
- local flags = {}
- for k, v in pairs(localcache.get("config", "options_" .. target:name())) do
- if k ~= "plat" and k ~= "mode" and k ~= "arch" and k ~= "clean" and k ~= "buildir" then
- table.insert(flags, "--" .. k .. "=" .. tostring(v));
- end
- end
- targetinfo.configflags = os.args(flags)
-
-- save runenvs
local runenvs = {}
local addrunenvs, setrunenvs = make_runenvs(target)
@@ -353,6 +344,15 @@ function main(outputdir, vsinfo)
vsinfo._groups = groups
vsinfo._group_deps = group_deps
+ -- init config flags
+ local flags = {}
+ for k, v in pairs(localcache.get("config", "options")) do
+ if k ~= "plat" and k ~= "mode" and k ~= "arch" and k ~= "clean" and k ~= "buildir" then
+ table.insert(flags, "--" .. k .. "=" .. tostring(v))
+ end
+ end
+ vsinfo.configflags = os.args(flags)
+
-- load targets
local targets = {}
vsinfo._arch_modes = {}