From b5e483352b76ff0d18635bc0b33912552e11bc74 Mon Sep 17 00:00:00 2001 From: charles seizilles Date: Fri, 10 Dec 2021 12:46:50 +0100 Subject: Fix typos --- xmake/plugins/project/vstudio/impl/vsinfo.lua | 2 +- xmake/plugins/project/vsxmake/render.lua | 4 ++-- 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 "" + return opt.paramsprovider(match, params) or "" 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 -- cgit v1.3.1