configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 670de4eadcbb84394fd49c1c0c949dd35bd2303b
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Feb 16 13:27:00 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Feb 18 01:45:59 2024 +0100
Latest VS 2022 Preview is 17.10.0 now
...while latest proper VS 2022 is 17.9.0
Change-Id: Idbd104d54dde1822957894d4f74b16e651a4c8b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163485
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
diff --git a/configure.ac b/configure.ac
index 61d6f5f3d5b6..276657f3cae1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4096,7 +4096,7 @@ map_vs_year_to_version()
2022)
vsversion=17;;
2022preview)
- vsversion=17.9;;
+ vsversion=17.10;;
*)
AC_MSG_ERROR([Assertion failure - invalid argument "$1" to
map_vs_year_to_version()]);;
esac
@@ -4216,7 +4216,7 @@ find_msvc()
vcyear=2019
vctoolset=v142
;;
- 17.0 | 17.9)
+ 17.0 | 17.10)
vcyear=2022
vctoolset=v143
;;
@@ -4388,7 +4388,7 @@ if test "$_os" = "WINNT"; then
# are always "better", we list them in reverse chronological order.
case "$vcnumwithdot" in
- 16.0 | 17.0 | 17.9)
+ 16.0 | 17.0 | 17.10)
WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
;;
esac
@@ -6755,7 +6755,7 @@ find_msms()
msmdir=
case "$VCVER" in
- 16.0 | 17.0 | 17.9)
+ 16.0 | 17.0 | 17.10)
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
@@ -6791,7 +6791,7 @@ find_msvc_x64_dlls()
msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
case "$VCVER" in
- 16.0 | 17.0 | 17.9)
+ 16.0 | 17.0 | 17.10)
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
