Latest VS 2022 Preview is 17.13.0 Preview 1.0 now
...while latest proper VS 2022 is 17.12.1 Change-Id: I93ebd2756e665f5f33ba71934ab625709c3758db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176893 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins
This commit is contained in:
parent
5c585cd975
commit
0b7faed281
1 changed files with 5 additions and 5 deletions
10
configure.ac
10
configure.ac
|
@ -4268,7 +4268,7 @@ map_vs_year_to_version()
|
|||
2022)
|
||||
vsversion=17;;
|
||||
2022preview)
|
||||
vsversion=17.12;;
|
||||
vsversion=17.13;;
|
||||
*)
|
||||
AC_MSG_ERROR([Assertion failure - invalid argument "$1" to map_vs_year_to_version()]);;
|
||||
esac
|
||||
|
@ -4394,7 +4394,7 @@ find_msvc()
|
|||
vcyear=2019
|
||||
vctoolset=v142
|
||||
;;
|
||||
17.0 | 17.12)
|
||||
17.0 | 17.13)
|
||||
vcyear=2022
|
||||
vctoolset=v143
|
||||
;;
|
||||
|
@ -4565,7 +4565,7 @@ if test "$_os" = "WINNT"; then
|
|||
# are always "better", we list them in reverse chronological order.
|
||||
|
||||
case "$vcnumwithdot" in
|
||||
16.0 | 17.0 | 17.12)
|
||||
16.0 | 17.0 | 17.13)
|
||||
WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
|
||||
;;
|
||||
esac
|
||||
|
@ -7048,7 +7048,7 @@ find_msms()
|
|||
|
||||
msmdir=
|
||||
case "$VCVER" in
|
||||
16.0 | 17.0 | 17.12)
|
||||
16.0 | 17.0 | 17.13)
|
||||
for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
|
||||
my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/"
|
||||
echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5
|
||||
|
@ -7084,7 +7084,7 @@ find_msvc_x64_dlls()
|
|||
|
||||
msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
|
||||
case "$VCVER" in
|
||||
16.0 | 17.0 | 17.12)
|
||||
16.0 | 17.0 | 17.13)
|
||||
for crtver in 141 142 143; do
|
||||
for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
|
||||
echo "$as_me:$LINENO: testing $VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5
|
||||
|
|
Loading…
Reference in a new issue