diff options
| author | ruki <[email protected]> | 2024-01-16 22:43:05 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-01-16 22:43:05 +0800 |
| commit | 59fbdc6260522310e8f5dc606ab7d5fc1a93bfd9 (patch) | |
| tree | 24beb19306f498f7d8a67f4b7accb723d5c146f5 | |
| parent | 4c40d7689500353292e28b6d3b27c9f6dc960c68 (diff) | |
improve vsdevcmd for arch
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index b28119bd6..104a2ca79 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -99,9 +99,12 @@ end -- load vcvarsall environment variables function _load_vcvarsall(vcvarsall, vsver, arch, opt) + opt = opt or {} + + -- is VsDevCmd.bat? + local is_vsdevcmd = path.basename(vcvarsall):lower() == "vsdevcmd" -- make the genvcvars.bat - opt = opt or {} local genvcvars_bat = os.tmpfile() .. "_genvcvars.bat" local file = io.open(genvcvars_bat, "w") file:print("@echo off") @@ -115,10 +118,18 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt) if vsver and tonumber(vsver) >= 16 then file:print("set VSCMD_SKIP_SENDTELEMETRY=yes") end - if opt.vcvars_ver then - file:print("call \"%s\" %s %s -vcvars_ver=%s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "", opt.vcvars_ver) + if is_vsdevcmd then + if opt.vcvars_ver then + file:print("call \"%s\" -arch=%s -winsdk=%s -vcvars_ver=%s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "", opt.vcvars_ver) + else + file:print("call \"%s\" -arch=%s -winsdk=%s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "") + end else - file:print("call \"%s\" %s %s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "") + if opt.vcvars_ver then + file:print("call \"%s\" %s %s -vcvars_ver=%s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "", opt.vcvars_ver) + else + file:print("call \"%s\" %s %s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "") + end end for idx, var in ipairs(get_vcvars()) do file:print("echo " .. var .. " = %%" .. var .. "%%") @@ -339,8 +350,7 @@ function _find_vstudio(opt) if vswhere_Common7ToolsDir and os.isdir(vswhere_Common7ToolsDir) then table.insert(paths, 1, vswhere_Common7ToolsDir) end - local vsdevcmd = find_file("VsDevCmd.bat", paths) - vcvarsall = vsdevcmd + vcvarsall = find_file("VsDevCmd.bat", paths) end if vcvarsall then |