Improve build system, support select msvc toolset version

halx99 · halx99 · commit b11840a836e8 · 2025-02-23T21:30:48.000+08:00
Two format:
- toolset with specified version `-cc msvc-14.39`
- platform toolset name `-cc msvc-140`
diff --git a/1k/1kiss.ps1 b/1k/1kiss.ps1
@@ -1522,8 +1522,10 @@ function preprocess_win() {
         $vs_ver = [VersionEx]$Global:VS_INST.installationVersion
         if ($vs_ver -ge [VersionEx]'16.0') {
             $outputOptions += '-A', $arch
-            if ($TOOLCHAIN_VER) {
+            if ($TOOLCHAIN_VER -match '^\d+$') {
                 $outputOptions += "-Tv$TOOLCHAIN_VER"
+            } elseif($TOOLCHAIN_VER -match '^\d+\.\d+$') {
+                $outputOptions += '-T', "version=$TOOLCHAIN_VER"
             }
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -1522,8 +1522,10 @@ function preprocess_win() {`
`1522`	`1522`	`$vs_ver = [VersionEx]$Global:VS_INST.installationVersion`
`1523`	`1523`	`if ($vs_ver -ge [VersionEx]'16.0') {`
`1524`	`1524`	`$outputOptions += '-A', $arch`
`1525`		`- if ($TOOLCHAIN_VER) {`
	`1525`	`+ if ($TOOLCHAIN_VER -match '^\d+$') {`
`1526`	`1526`	`$outputOptions += "-Tv$TOOLCHAIN_VER"`
	`1527`	`+ } elseif($TOOLCHAIN_VER -match '^\d+\.\d+$') {`
	`1528`	`+ $outputOptions += '-T', "version=$TOOLCHAIN_VER"`
`1527`	`1529`	`}`
`1528`	`1530`	`}`
`1529`	`1531`	`else {`