configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit 00e64d04909964e29a0085b6b14fc4e7b2b892b1 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Apr 23 17:57:45 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Apr 23 20:49:28 2025 +0200 Latest VS 2022 Preview is 17.14.0 Preview 4.0 now ..while latest proper VS 2022 is 17.13.6 Change-Id: I1c72cb27b00bee0ce7a382988c34a43e6a0d111a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184518 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/configure.ac b/configure.ac index b382f38ce54d..57545beeb4fb 100644 --- a/configure.ac +++ b/configure.ac @@ -4306,7 +4306,7 @@ map_vs_year_to_version() 2022) vsversion=17;; 2022preview) - vsversion=17.13;; + vsversion=17.14;; *) AC_MSG_ERROR([Assertion failure - invalid argument "$1" to map_vs_year_to_version()]);; esac @@ -4432,7 +4432,7 @@ find_msvc() vcyear=2019 vctoolset=v142 ;; - 17.0 | 17.13) + 17.0 | 17.14) vcyear=2022 vctoolset=v143 ;; @@ -4603,7 +4603,7 @@ if test "$_os" = "WINNT"; then # are always "better", we list them in reverse chronological order. case "$vcnumwithdot" in - 16.0 | 17.0 | 17.13) + 16.0 | 17.0 | 17.14) WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0" ;; esac @@ -7145,7 +7145,7 @@ find_msms() msmdir= case "$VCVER" in - 16.0 | 17.0 | 17.13) + 16.0 | 17.0 | 17.14) 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 @@ -7182,7 +7182,7 @@ find_msvc_x64_dlls() msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" case "$VCVER" in - 16.0 | 17.0 | 17.13) + 16.0 | 17.0 | 17.14) 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
