Skip to content

Commit 18ce75f

Browse files
committed
jBuild: switched to vc2022 17.14.4, ver 19.44.35209 (instead of 17.9.5)
1 parent d089c3c commit 18ce75f

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

prog/_jBuild/windows/clang-sets.jam

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ _OBJ_SUFFIX = .obj ;
33

44
_CLANG_LIB_FOLDER = $(CLangVer:B) ;
55
_CLANG_LIB_FOLDER = $(_CLANG_LIB_FOLDER:B) ;
6+
local COMPILER_AND_STL_VERSION_MISMATCH = ;
67

78
if $(_CLANG_LIB_FOLDER) = 15 {
89
_VC_DIR = $(_DEVTOOL)/vc2019_16.11.34 ;
@@ -11,6 +12,11 @@ if $(_CLANG_LIB_FOLDER) = 15 {
1112
} else if $(_CLANG_LIB_FOLDER) in 16 17 18 19 20 21 {
1213
_VC_DIR = $(_DEVTOOL)/vc2022_17.9.5 ;
1314
_MSC_VER = 19.39.33523 ;
15+
if ! [ GLOB $(_VC_DIR) : * ] {
16+
_VC_DIR = $(_DEVTOOL)/vc2022_17.14.4 ;
17+
_MSC_VER = 19.44.35209 ;
18+
if $(_CLANG_LIB_FOLDER) in 16 17 18 { COMPILER_AND_STL_VERSION_MISMATCH = -D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH ; }
19+
}
1420
} else {
1521
exit Unknown CLangVer $(CLangVer) ;
1622
}
@@ -71,6 +77,7 @@ local _DEF_C_CMDLINE =
7177
-Werror=invalid-noreturn
7278
-Werror=return-type
7379
# -Wunused-parameter -Wunused-variable
80+
$(COMPILER_AND_STL_VERSION_MISMATCH)
7481
;
7582

7683
if $(ClangThreadSafety) = yes {

prog/tools/maxplug/maxPlugin.jam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if $(Platform)-$(PlatformArch) = windows-x86_64 {
4444
case Max2022 : PlatformSpec = vc15 ; WinSdkVer = win.sdk.100 ; VCUpdateVer = 15.9.5 ; WinSdkUpdateVer = 18362 ; #17134
4545
case Max2023 : PlatformSpec = vc16 ; WinSdkVer = win.sdk.100 ; VCUpdateVer = 16.11.34 ; WinSdkUpdateVer = 19041 ;
4646
case Max2024 : PlatformSpec = vc16 ; WinSdkVer = win.sdk.100 ; VCUpdateVer = 16.11.34 ; WinSdkUpdateVer = 19041 ;
47-
case Max2025 : PlatformSpec = vc17 ; WinSdkVer = win.sdk.100 ; VCUpdateVer = 17.9.5 ; WinSdkUpdateVer = 22621 ;
47+
case Max2025 : PlatformSpec = vc17 ; WinSdkVer = win.sdk.100 ; VCUpdateVer = 17.14.4 ; WinSdkUpdateVer = 22621 ;
4848
case * : exit $(MaxVer) not supported for $(Platform) ;
4949
}
5050
} else {

0 commit comments

Comments
 (0)