summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-06-07 22:26:18 +0800
committerruki <[email protected]>2023-06-07 22:26:18 +0800
commite7e17687d3e5278e5337f0b1d5cb32bad4f14e2d (patch)
treec87b1e8d329d8bc0ab9e5d121ad686563a18b7ae
parent3b4050dd031bd6e10f14f048f7283d3fdea97a34 (diff)
fix cflags sep for vsxmake
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index 16ba9d3f5..edc4a17b8 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -73,7 +73,7 @@ function _make_dirs(dir)
return path.joinenv(r)
end
-function _make_arrs(arr)
+function _make_arrs(arr, sep)
if arr == nil then
return ""
end
@@ -82,10 +82,10 @@ function _make_arrs(arr)
end
local r = {}
for k, v in ipairs(arr) do
- r[k] = _make_arrs(v)
+ r[k] = _make_arrs(v, sep)
end
r = table.unique(r)
- return table.concat(r, ";")
+ return table.concat(r, sep or ";")
end
-- get values from target
@@ -138,9 +138,9 @@ function _make_targetinfo(mode, arch, target)
targetinfo.defines = _make_arrs(_get_values_from_target(target, "defines"))
-- save flags
- targetinfo.cflags = _make_arrs(_get_values_from_target(target, "cflags"))
- targetinfo.cxflags = _make_arrs(_get_values_from_target(target, "cxflags"))
- targetinfo.cxxflags = _make_arrs(_get_values_from_target(target, "cxxflags"))
+ targetinfo.cflags = _make_arrs(_get_values_from_target(target, "cflags"), " ")
+ targetinfo.cxflags = _make_arrs(_get_values_from_target(target, "cxflags"), " ")
+ targetinfo.cxxflags = _make_arrs(_get_values_from_target(target, "cxxflags"), " ")
-- save languages
targetinfo.languages = _make_arrs(_get_values_from_target(target, "languages"))