diff options
| author | ruki <[email protected]> | 2021-12-11 00:38:10 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-11 00:38:10 +0800 |
| commit | 70705200fcd2fa0af9fd2be89c50c7554d6b4a2b (patch) | |
| tree | 95a90e8c87ee16f5ac547bae58bf267e37a9bfa2 | |
| parent | a70d5148d402195a411c590fd049c045ed5b5c7b (diff) | |
| parent | b5e483352b76ff0d18635bc0b33912552e11bc74 (diff) | |
Merge pull request #1901 from WubiCookie/master
Update vsxmake and fixes for IntelliSense
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vsinfo.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/render.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsxmake.lua | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vsinfo.lua b/xmake/plugins/project/vstudio/impl/vsinfo.lua index 9b6cc829c..e210f6705 100644 --- a/xmake/plugins/project/vstudio/impl/vsinfo.lua +++ b/xmake/plugins/project/vstudio/impl/vsinfo.lua @@ -90,7 +90,7 @@ local vsinfo = , project_version = "17" , filters_version = "4.0" , solution_version = "12" - , toolset_version = "v142" + , toolset_version = "v143" , sdk_version = "10.0.19041.0" } } diff --git a/xmake/plugins/project/vsxmake/render.lua b/xmake/plugins/project/vsxmake/render.lua index 99be35197..d599f1dde 100644 --- a/xmake/plugins/project/vsxmake/render.lua +++ b/xmake/plugins/project/vsxmake/render.lua @@ -18,7 +18,7 @@ -- @file render.lua -- -function _fill(opt, parmas) +function _fill(opt, params) return function(match) local imp = match:match("^Import%((.+)%)$") if imp then @@ -28,7 +28,7 @@ function _fill(opt, parmas) local args = path.filename(func):match("%((.+)%)$"):split(",") return _render(func, opt, args) end - return opt.paramsprovider(match, parmas) or "<Not Provided>" + return opt.paramsprovider(match, params) or "<Not Provided>" end end diff --git a/xmake/plugins/project/vsxmake/vsxmake.lua b/xmake/plugins/project/vsxmake/vsxmake.lua index 894a1895b..469448764 100644 --- a/xmake/plugins/project/vsxmake/vsxmake.lua +++ b/xmake/plugins/project/vsxmake/vsxmake.lua @@ -202,7 +202,7 @@ function make(version) version = tonumber(config.get("vs")) if not version then return function(outputdir) - raise("invalid vs version, run `xmake f --vs=201x`") + raise("invalid vs version, run `xmake f --vs=20xx`") end end end |