diff options
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/core/tools/cl.lua | 14 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 24 |
2 files changed, 21 insertions, 17 deletions
diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua index be521098b..c4eede192 100644 --- a/xmake/modules/core/tools/cl.lua +++ b/xmake/modules/core/tools/cl.lua @@ -77,15 +77,15 @@ function init(self) -- language , ["-ansi"] = "" , ["-std=c99"] = "-TP" -- compile as c++ files because msvc doesn't support c99 - , ["-std=c11"] = "-std:c11" - , ["-std=c17"] = "-std:c17" - , ["-std=c2x"] = "-std:clatest" - , ["-std=c23"] = "-std:clatest" + , ["-std=c11"] = "-std:c11" + , ["-std=c17"] = "-std:c17" + , ["-std=c2x"] = "-std:clatest" + , ["-std=c23"] = "-std:clatest" , ["-std=gnu99"] = "-TP" -- compile as c++ files because msvc doesn't support c99 - , ["-std=gnu11"] = "-std:c11" + , ["-std=gnu11"] = "-std:c11" , ["-std=gnu17"] = "-std:c17" - , ["-std=gnu2x"] = "-std:clatest" - , ["-std=gnu23"] = "-std:clatest" + , ["-std=gnu2x"] = "-std:clatest" + , ["-std=gnu23"] = "-std:clatest" , ["-std=.*"] = "" -- others diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 183f7162f..2ce2b44eb 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -266,10 +266,11 @@ function _find_vstudio(opt) if vcvarsall and os.isfile(vcvarsall) and vsvers[VisualStudioVersion] then -- load vcvarsall - local vcvarsall_x86 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x86", opt) - local vcvarsall_x64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x64", opt) - local vcvarsall_arm = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm", opt) - local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm64", opt) + local vcvarsall_x86 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x86", opt) + local vcvarsall_x64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x64", opt) + local vcvarsall_arm = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm", opt) + local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm64", opt) + local vcvarsall_arm64ec = vcvarsall_arm64 -- save results local results = {} @@ -280,7 +281,8 @@ function _find_vstudio(opt) x86 = vcvarsall_x86, x64 = vcvarsall_x64, arm = vcvarsall_arm, - arm64 = vcvarsall_arm64 + arm64 = vcvarsall_arm64, + arm64ec = vcvarsall_arm64ec } } return results @@ -375,10 +377,11 @@ function _find_vstudio(opt) if vcvarsall then -- load vcvarsall - local vcvarsall_x86 = _load_vcvarsall(vcvarsall, version, "x86", opt) - local vcvarsall_x64 = _load_vcvarsall(vcvarsall, version, "x64", opt) - local vcvarsall_arm = _load_vcvarsall(vcvarsall, version, "arm", opt) - local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, version, "arm64", opt) + local vcvarsall_x86 = _load_vcvarsall(vcvarsall, version, "x86", opt) + local vcvarsall_x64 = _load_vcvarsall(vcvarsall, version, "x64", opt) + local vcvarsall_arm = _load_vcvarsall(vcvarsall, version, "arm", opt) + local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, version, "arm64", opt) + local vcvarsall_arm64ec = vcvarsall_arm64 -- save results results[vsvers[version]] = { @@ -388,7 +391,8 @@ function _find_vstudio(opt) x86 = vcvarsall_x86, x64 = vcvarsall_x64, arm = vcvarsall_arm, - arm64 = vcvarsall_arm64 + arm64 = vcvarsall_arm64, + arm64ec = vcvarsall_arm64ec } } end |