diff --git a/buildinfo/mingw.txt b/buildinfo/mingw.txt
index 2e27180..b38b7bc 100644
--- a/buildinfo/mingw.txt
+++ b/buildinfo/mingw.txt
@@ -2,9 +2,9 @@ Build environment
 -----------------
 Windows 10.0.20348
 Ressource Hacker 5.2.7.427
-7-Zip 23.01 ultra compression
-Git 2.45.0.1
-OpenCLonD3D12 ICD 2024.04.04
+7-Zip 24.05 ultra compression
+Git 2.45.1.1
+OpenCLonD3D12 ICD 2024.05.11
 
 MSYS2 environment
 -----------------
@@ -19,7 +19,7 @@ ca-certificates 20240203-1
 coreutils 8.32-5
 curl 8.7.1-1
 dash 0.5.12-1
-db 5.3.28-5
+db 6.2.32-5
 file 5.45-1
 filesystem 2023.02.07-1
 findutils 4.9.0-3
@@ -33,7 +33,7 @@ gmp 6.3.0-1
 gnupg 2.4.5-1
 grep 1~3.0-6
 gzip 1.13-1
-heimdal-libs 7.8.0-4
+heimdal-libs 7.8.0-5
 inetutils 2.5-2
 info 7.1-2
 less 643-1
@@ -42,7 +42,7 @@ libasprintf 0.22.4-1
 libassuan 2.5.7-1
 libbz2 1.0.8-4
 libcurl 8.7.1-1
-libdb 5.3.28-5
+libdb 6.2.32-5
 libedit 20221030_3.1-1
 libexpat 2.6.2-1
 libffi 3.4.6-1
@@ -60,7 +60,7 @@ libksba 1.6.6-1
 liblz4 1.9.4-1
 liblzma 5.6.1-2
 libnettle 3.9.1-1
-libnghttp2 1.61.0-1
+libnghttp2 1.62.0-1
 libnpth 1.7-1
 libopenssl 3.3.0-1
 libp11-kit 0.25.3-1
@@ -76,152 +76,150 @@ libutil-linux 2.35.2-4
 libxcrypt 4.4.36-1
 libzstd 1.5.6-1
 m4 1.4.19-2
-mingw-w64-i686-binutils 2.42-2
-mingw-w64-i686-brotli 1.1.0-1
-mingw-w64-i686-bzip2 1.0.8-3
-mingw-w64-i686-c-ares 1.28.1-1
-mingw-w64-i686-ca-certificates 20240203-1
-mingw-w64-i686-clang 18.1.4-1
-mingw-w64-i686-clang-libs 18.1.4-1
-mingw-w64-i686-cmake 3.29.3-1
-mingw-w64-i686-crt-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-i686-curl 8.7.1-1
-mingw-w64-i686-directx-headers 1.613.1-1
-mingw-w64-i686-expat 2.6.2-1
-mingw-w64-i686-gcc 13.2.0-6
-mingw-w64-i686-gcc-libs 13.2.0-6
-mingw-w64-i686-gdb 14.2-1
-mingw-w64-i686-gettext-runtime 0.22.5-2
-mingw-w64-i686-glslang 14.1.0-1
-mingw-w64-i686-gmp 6.3.0-2
-mingw-w64-i686-headers-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-i686-isl 0.26-1
-mingw-w64-i686-jsoncpp 1.9.5-3
-mingw-w64-i686-libarchive 3.7.4-1
-mingw-w64-i686-libb2 0.98.1-2
-mingw-w64-i686-libclc 18.1.4-1
-mingw-w64-i686-libelf 0.8.13-7
-mingw-w64-i686-libffi 3.4.6-1
-mingw-w64-i686-libiconv 1.17-4
-mingw-w64-i686-libidn2 2.3.7-2
-mingw-w64-i686-libpsl 0.21.5-2
-mingw-w64-i686-libssh2 1.11.0-2
-mingw-w64-i686-libsystre 1.0.1-5
-mingw-w64-i686-libtasn1 4.19.0-1
-mingw-w64-i686-libtre-git r177.07e66d0-2
-mingw-w64-i686-libunistring 1.2-1
-mingw-w64-i686-libuv 1.48.0-1
-mingw-w64-i686-libva 2.21.0-1
-mingw-w64-i686-libwinpthread-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-i686-libxml2 2.12.6-1
-mingw-w64-i686-llvm 18.1.4-1
-mingw-w64-i686-llvm-libs 18.1.4-1
-mingw-w64-i686-lz4 1.9.4-1
-mingw-w64-i686-meson 1.4.0-2
-mingw-w64-i686-mpc 1.3.1-2
-mingw-w64-i686-mpdecimal 4.0.0-1
-mingw-w64-i686-mpfr 4.2.1-2
-mingw-w64-i686-ncurses 6.4.20231217-1
-mingw-w64-i686-nghttp2 1.61.0-1
-mingw-w64-i686-ninja 1.12.0-1
-mingw-w64-i686-openssl 3.3.0-2
-mingw-w64-i686-p11-kit 0.25.3-2
-mingw-w64-i686-pkgconf 1~2.2.0-1
-mingw-w64-i686-polly 18.1.4-1
-mingw-w64-i686-python 3.11.9-1
-mingw-w64-i686-python-mako 1.3.2-1
-mingw-w64-i686-python-markupsafe 2.1.5-1
-mingw-w64-i686-readline 8.2.010-1
-mingw-w64-i686-rhash 1.4.4-3
-mingw-w64-i686-spirv-headers 2~1.3.280.0-1
-mingw-w64-i686-spirv-llvm-translator 18.1.0-2
-mingw-w64-i686-spirv-tools 3~1.3.280.0-1
-mingw-w64-i686-sqlite3 3.45.2-1
-mingw-w64-i686-tcl 8.6.13-1
-mingw-w64-i686-termcap 1.3.1-7
-mingw-w64-i686-tk 8.6.13-1
-mingw-w64-i686-tzdata 2024a-1
-mingw-w64-i686-vulkan-headers 1.3.280.0-1
-mingw-w64-i686-vulkan-loader 1.3.280.0-1
-mingw-w64-i686-windows-default-manifest 6.4-4
-mingw-w64-i686-winpthreads-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-i686-xxhash 0.8.2-2
-mingw-w64-i686-xz 5.6.1-2
-mingw-w64-i686-zlib 1.3.1-1
-mingw-w64-i686-zstd 1.5.6-2
-mingw-w64-ucrt-x86_64-binutils 2.42-2
-mingw-w64-ucrt-x86_64-brotli 1.1.0-1
-mingw-w64-ucrt-x86_64-bzip2 1.0.8-3
-mingw-w64-ucrt-x86_64-c-ares 1.28.1-1
-mingw-w64-ucrt-x86_64-ca-certificates 20240203-1
-mingw-w64-ucrt-x86_64-clang 18.1.4-1
-mingw-w64-ucrt-x86_64-clang-libs 18.1.4-1
-mingw-w64-ucrt-x86_64-cmake 3.29.3-1
-mingw-w64-ucrt-x86_64-crt-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-ucrt-x86_64-curl 8.7.1-1
-mingw-w64-ucrt-x86_64-directx-headers 1.613.1-1
-mingw-w64-ucrt-x86_64-expat 2.6.2-1
-mingw-w64-ucrt-x86_64-gcc 13.2.0-6
-mingw-w64-ucrt-x86_64-gcc-libs 13.2.0-6
-mingw-w64-ucrt-x86_64-gdb 14.2-1
-mingw-w64-ucrt-x86_64-gettext-runtime 0.22.5-2
-mingw-w64-ucrt-x86_64-glslang 14.1.0-1
-mingw-w64-ucrt-x86_64-gmp 6.3.0-2
-mingw-w64-ucrt-x86_64-headers-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-ucrt-x86_64-isl 0.26-1
-mingw-w64-ucrt-x86_64-jsoncpp 1.9.5-3
-mingw-w64-ucrt-x86_64-libarchive 3.7.4-1
-mingw-w64-ucrt-x86_64-libb2 0.98.1-2
-mingw-w64-ucrt-x86_64-libclc 18.1.4-1
-mingw-w64-ucrt-x86_64-libelf 0.8.13-7
-mingw-w64-ucrt-x86_64-libffi 3.4.6-1
-mingw-w64-ucrt-x86_64-libiconv 1.17-4
-mingw-w64-ucrt-x86_64-libidn2 2.3.7-2
-mingw-w64-ucrt-x86_64-libpsl 0.21.5-2
-mingw-w64-ucrt-x86_64-libssh2 1.11.0-2
-mingw-w64-ucrt-x86_64-libsystre 1.0.1-5
-mingw-w64-ucrt-x86_64-libtasn1 4.19.0-1
-mingw-w64-ucrt-x86_64-libtre-git r177.07e66d0-2
-mingw-w64-ucrt-x86_64-libunistring 1.2-1
-mingw-w64-ucrt-x86_64-libuv 1.48.0-1
-mingw-w64-ucrt-x86_64-libva 2.21.0-1
-mingw-w64-ucrt-x86_64-libwinpthread-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-ucrt-x86_64-libxml2 2.12.6-1
-mingw-w64-ucrt-x86_64-llvm 18.1.4-1
-mingw-w64-ucrt-x86_64-llvm-libs 18.1.4-1
-mingw-w64-ucrt-x86_64-lz4 1.9.4-1
-mingw-w64-ucrt-x86_64-meson 1.4.0-2
-mingw-w64-ucrt-x86_64-mpc 1.3.1-2
-mingw-w64-ucrt-x86_64-mpdecimal 4.0.0-1
-mingw-w64-ucrt-x86_64-mpfr 4.2.1-2
-mingw-w64-ucrt-x86_64-ncurses 6.4.20231217-1
-mingw-w64-ucrt-x86_64-nghttp2 1.61.0-1
-mingw-w64-ucrt-x86_64-ninja 1.12.0-1
-mingw-w64-ucrt-x86_64-openssl 3.3.0-2
-mingw-w64-ucrt-x86_64-p11-kit 0.25.3-2
-mingw-w64-ucrt-x86_64-pkgconf 1~2.2.0-1
-mingw-w64-ucrt-x86_64-polly 18.1.4-1
-mingw-w64-ucrt-x86_64-python 3.11.9-1
-mingw-w64-ucrt-x86_64-python-mako 1.3.2-1
-mingw-w64-ucrt-x86_64-python-markupsafe 2.1.5-1
-mingw-w64-ucrt-x86_64-readline 8.2.010-1
-mingw-w64-ucrt-x86_64-rhash 1.4.4-3
-mingw-w64-ucrt-x86_64-spirv-headers 2~1.3.280.0-1
-mingw-w64-ucrt-x86_64-spirv-llvm-translator 18.1.0-2
-mingw-w64-ucrt-x86_64-spirv-tools 3~1.3.280.0-1
-mingw-w64-ucrt-x86_64-sqlite3 3.45.2-1
-mingw-w64-ucrt-x86_64-tcl 8.6.13-1
-mingw-w64-ucrt-x86_64-termcap 1.3.1-7
-mingw-w64-ucrt-x86_64-tk 8.6.13-1
-mingw-w64-ucrt-x86_64-tzdata 2024a-1
-mingw-w64-ucrt-x86_64-vulkan-headers 1.3.280.0-1
-mingw-w64-ucrt-x86_64-vulkan-loader 1.3.280.0-1
-mingw-w64-ucrt-x86_64-windows-default-manifest 6.4-4
-mingw-w64-ucrt-x86_64-winpthreads-git 11.0.0.r731.g8fdf7c9b5-1
-mingw-w64-ucrt-x86_64-xxhash 0.8.2-2
-mingw-w64-ucrt-x86_64-xz 5.6.1-2
-mingw-w64-ucrt-x86_64-zlib 1.3.1-1
-mingw-w64-ucrt-x86_64-zstd 1.5.6-2
+mingw-w64-clang-i686-brotli 1.1.0-1
+mingw-w64-clang-i686-bzip2 1.0.8-3
+mingw-w64-clang-i686-c-ares 1.28.1-1
+mingw-w64-clang-i686-ca-certificates 20240203-1
+mingw-w64-clang-i686-clang 18.1.5-1
+mingw-w64-clang-i686-clang-libs 18.1.5-1
+mingw-w64-clang-i686-cmake 3.29.3-3
+mingw-w64-clang-i686-compiler-rt 18.1.5-1
+mingw-w64-clang-i686-crt-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-i686-curl 8.7.1-1
+mingw-w64-clang-i686-directx-headers 1.613.1-1
+mingw-w64-clang-i686-expat 2.6.2-1
+mingw-w64-clang-i686-gdb 14.2-1
+mingw-w64-clang-i686-gettext-runtime 0.22.5-2
+mingw-w64-clang-i686-glslang 14.1.0-1
+mingw-w64-clang-i686-gmp 6.3.0-2
+mingw-w64-clang-i686-headers-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-i686-jsoncpp 1.9.5-3
+mingw-w64-clang-i686-libarchive 3.7.4-1
+mingw-w64-clang-i686-libb2 0.98.1-2
+mingw-w64-clang-i686-libc++ 18.1.5-1
+mingw-w64-clang-i686-libclc 18.1.5-1
+mingw-w64-clang-i686-libelf 0.8.13-7
+mingw-w64-clang-i686-libffi 3.4.6-1
+mingw-w64-clang-i686-libiconv 1.17-4
+mingw-w64-clang-i686-libidn2 2.3.7-2
+mingw-w64-clang-i686-libpsl 0.21.5-2
+mingw-w64-clang-i686-libssh2 1.11.0-2
+mingw-w64-clang-i686-libsystre 1.0.1-5
+mingw-w64-clang-i686-libtasn1 4.19.0-1
+mingw-w64-clang-i686-libtre-git r177.07e66d0-2
+mingw-w64-clang-i686-libunistring 1.2-1
+mingw-w64-clang-i686-libunwind 18.1.5-1
+mingw-w64-clang-i686-libuv 1.48.0-1
+mingw-w64-clang-i686-libva 2.21.0-1
+mingw-w64-clang-i686-libwinpthread-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-i686-libxml2 2.12.7-1
+mingw-w64-clang-i686-lld 18.1.5-1
+mingw-w64-clang-i686-llvm 18.1.5-1
+mingw-w64-clang-i686-llvm-libs 18.1.5-1
+mingw-w64-clang-i686-lz4 1.9.4-1
+mingw-w64-clang-i686-meson 1.4.0-3
+mingw-w64-clang-i686-mpc 1.3.1-2
+mingw-w64-clang-i686-mpdecimal 4.0.0-1
+mingw-w64-clang-i686-mpfr 4.2.1-2
+mingw-w64-clang-i686-ncurses 6.4.20231217-1
+mingw-w64-clang-i686-nghttp2 1.61.0-1
+mingw-w64-clang-i686-ninja 1.12.1-1
+mingw-w64-clang-i686-openssl 3.3.0-2
+mingw-w64-clang-i686-p11-kit 0.25.3-2
+mingw-w64-clang-i686-pkgconf 1~2.2.0-1
+mingw-w64-clang-i686-polly 18.1.5-1
+mingw-w64-clang-i686-python 3.11.9-1
+mingw-w64-clang-i686-python-mako 1.3.3-1
+mingw-w64-clang-i686-python-markupsafe 2.1.5-1
+mingw-w64-clang-i686-readline 8.2.010-1
+mingw-w64-clang-i686-rhash 1.4.4-3
+mingw-w64-clang-i686-spirv-headers 2~1.3.283.0-1
+mingw-w64-clang-i686-spirv-llvm-translator 18.1.0-2
+mingw-w64-clang-i686-spirv-tools 3~1.3.283.0-1
+mingw-w64-clang-i686-sqlite3 3.45.2-2
+mingw-w64-clang-i686-tcl 8.6.13-1
+mingw-w64-clang-i686-termcap 1.3.1-7
+mingw-w64-clang-i686-tk 8.6.13-1
+mingw-w64-clang-i686-tzdata 2024a-1
+mingw-w64-clang-i686-vulkan-headers 1.3.283.0-1
+mingw-w64-clang-i686-vulkan-loader 1.3.283.0-1
+mingw-w64-clang-i686-winpthreads-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-i686-xxhash 0.8.2-2
+mingw-w64-clang-i686-xz 5.6.1-2
+mingw-w64-clang-i686-zlib 1.3.1-1
+mingw-w64-clang-i686-zstd 1.5.6-2
+mingw-w64-clang-x86_64-brotli 1.1.0-1
+mingw-w64-clang-x86_64-bzip2 1.0.8-3
+mingw-w64-clang-x86_64-c-ares 1.28.1-1
+mingw-w64-clang-x86_64-ca-certificates 20240203-1
+mingw-w64-clang-x86_64-clang 18.1.5-1
+mingw-w64-clang-x86_64-clang-libs 18.1.5-1
+mingw-w64-clang-x86_64-cmake 3.29.3-3
+mingw-w64-clang-x86_64-compiler-rt 18.1.5-1
+mingw-w64-clang-x86_64-crt-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-x86_64-curl 8.7.1-1
+mingw-w64-clang-x86_64-directx-headers 1.613.1-1
+mingw-w64-clang-x86_64-expat 2.6.2-1
+mingw-w64-clang-x86_64-gdb 14.2-1
+mingw-w64-clang-x86_64-gettext-runtime 0.22.5-2
+mingw-w64-clang-x86_64-glslang 14.1.0-1
+mingw-w64-clang-x86_64-gmp 6.3.0-2
+mingw-w64-clang-x86_64-headers-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-x86_64-jsoncpp 1.9.5-3
+mingw-w64-clang-x86_64-libarchive 3.7.4-1
+mingw-w64-clang-x86_64-libb2 0.98.1-2
+mingw-w64-clang-x86_64-libc++ 18.1.5-1
+mingw-w64-clang-x86_64-libclc 18.1.5-1
+mingw-w64-clang-x86_64-libelf 0.8.13-7
+mingw-w64-clang-x86_64-libffi 3.4.6-1
+mingw-w64-clang-x86_64-libiconv 1.17-4
+mingw-w64-clang-x86_64-libidn2 2.3.7-2
+mingw-w64-clang-x86_64-libpsl 0.21.5-2
+mingw-w64-clang-x86_64-libssh2 1.11.0-2
+mingw-w64-clang-x86_64-libsystre 1.0.1-5
+mingw-w64-clang-x86_64-libtasn1 4.19.0-1
+mingw-w64-clang-x86_64-libtre-git r177.07e66d0-2
+mingw-w64-clang-x86_64-libunistring 1.2-1
+mingw-w64-clang-x86_64-libunwind 18.1.5-1
+mingw-w64-clang-x86_64-libuv 1.48.0-1
+mingw-w64-clang-x86_64-libva 2.21.0-1
+mingw-w64-clang-x86_64-libwinpthread-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-x86_64-libxml2 2.12.7-1
+mingw-w64-clang-x86_64-lld 18.1.5-1
+mingw-w64-clang-x86_64-llvm 18.1.5-1
+mingw-w64-clang-x86_64-llvm-libs 18.1.5-1
+mingw-w64-clang-x86_64-lz4 1.9.4-1
+mingw-w64-clang-x86_64-meson 1.4.0-3
+mingw-w64-clang-x86_64-mpc 1.3.1-2
+mingw-w64-clang-x86_64-mpdecimal 4.0.0-1
+mingw-w64-clang-x86_64-mpfr 4.2.1-2
+mingw-w64-clang-x86_64-ncurses 6.4.20231217-1
+mingw-w64-clang-x86_64-nghttp2 1.61.0-1
+mingw-w64-clang-x86_64-ninja 1.12.1-1
+mingw-w64-clang-x86_64-openssl 3.3.0-2
+mingw-w64-clang-x86_64-p11-kit 0.25.3-2
+mingw-w64-clang-x86_64-pkgconf 1~2.2.0-1
+mingw-w64-clang-x86_64-polly 18.1.5-1
+mingw-w64-clang-x86_64-python 3.11.9-1
+mingw-w64-clang-x86_64-python-mako 1.3.3-1
+mingw-w64-clang-x86_64-python-markupsafe 2.1.5-1
+mingw-w64-clang-x86_64-readline 8.2.010-1
+mingw-w64-clang-x86_64-rhash 1.4.4-3
+mingw-w64-clang-x86_64-spirv-headers 2~1.3.283.0-1
+mingw-w64-clang-x86_64-spirv-llvm-translator 18.1.0-2
+mingw-w64-clang-x86_64-spirv-tools 3~1.3.283.0-1
+mingw-w64-clang-x86_64-sqlite3 3.45.2-2
+mingw-w64-clang-x86_64-tcl 8.6.13-1
+mingw-w64-clang-x86_64-termcap 1.3.1-7
+mingw-w64-clang-x86_64-tk 8.6.13-1
+mingw-w64-clang-x86_64-tzdata 2024a-1
+mingw-w64-clang-x86_64-vulkan-headers 1.3.283.0-1
+mingw-w64-clang-x86_64-vulkan-loader 1.3.283.0-1
+mingw-w64-clang-x86_64-winpthreads-git 11.0.0.r750.g05598db99-1
+mingw-w64-clang-x86_64-xxhash 0.8.2-2
+mingw-w64-clang-x86_64-xz 5.6.1-2
+mingw-w64-clang-x86_64-zlib 1.3.1-1
+mingw-w64-clang-x86_64-zstd 1.5.6-2
 mintty 1~3.7.1-1
 mpfr 4.2.1-1
 msys2-keyring 1~20240410-1
@@ -232,11 +230,11 @@ ncurses 6.4-2
 nettle 3.9.1-1
 openssl 3.3.0-1
 p11-kit 0.25.3-1
-pacman 6.0.2-15
-pacman-contrib 1.10.5-1
+pacman 6.1.0-2
+pacman-contrib 1.10.6-1
 pacman-mirrors 20240504-1
 patch 2.7.6-2
-perl 5.38.2-1
+perl 5.38.2-2
 pinentry 1.2.1-1
 rebase 4.5.0-4
 sed 4.9-1
diff --git a/buildinfo/msvc.txt b/buildinfo/msvc.txt
index e3a1686..7734daf 100644
--- a/buildinfo/msvc.txt
+++ b/buildinfo/msvc.txt
@@ -2,31 +2,31 @@ Build environment
 -----------------
 Windows 10.0.20348
 Ressource Hacker 5.2.7.427
-7-Zip 23.01 ultra compression
-Git 2.45.0.1
-Visual Studio Community 2022 v17.9.6
-Windows SDK 10.1.22621.3233
-Windows Driver Kit 10.1.22621.2428
-Nuget Commandline tool 6.9.1.3
+7-Zip 24.05 ultra compression
+Git 2.45.1.1
+Visual Studio Build Tools 2022 v17.9.7
+Windows SDK 10.1.26100.1
+Windows Driver Kit 10.1.26100.1
+Nuget Commandline tool 6.10.0.107
 Python 3.12.3
 
 Python packages
 ---------------
-Mako       1.3.3
+Mako       1.3.5
 MarkupSafe 2.1.5
 meson      1.4.0
 pip        24.0
-setuptools 69.5.1
+setuptools 70.0.0
 
 CMake 3.29.3
-Ninja 1.12.0
-LLVM 18.1.5
+Ninja 1.12.1
+LLVM 18.1.6
 SPIRV Tools 2024.2.1
 flex 2.6.4
 Bison 3.8.2
 pkgconf 2.2.0
 zlib 1.3.1
-OpenCLonD3D12 ICD 2024.04.04
+OpenCLonD3D12 ICD 2024.05.11
 libva 2.21.0
 VA-API 1.21.0
 DirectX headers 1.613.1
diff --git a/buildscript/modules/abi.cmd b/buildscript/modules/abi.cmd
index 2079d09..3641f13 100644
--- a/buildscript/modules/abi.cmd
+++ b/buildscript/modules/abi.cmd
@@ -8,8 +8,8 @@
 @rem Select MinGW shell based on ABI
 @set MSYSTEM=UCRT64
 @set LMSYSTEM=ucrt64
-@if %abi%==x64 set /p gccmsvcrt=Use MSVCRT compatible toolchain for MinGW GCC x64 build (y/n):
-@if %abi%==x64 echo.
+@if %abi%==x64 IF NOT %toolchain%==msvc set /p gccmsvcrt=Use MSVCRT compatible toolchain for MinGW GCC x64 build (y/n):
+@if %abi%==x64 IF NOT %toolchain%==msvc echo.
 @if /I "%gccmsvcrt%"=="y" set MSYSTEM=MINGW64
 @IF /I "%gccmsvcrt%"=="y" set LMSYSTEM=mingw64
 @IF %abi%==x86 set MSYSTEM=MINGW32
diff --git a/buildscript/modules/mesa3d.cmd b/buildscript/modules/mesa3d.cmd
index 04704e7..76eae0f 100644
--- a/buildscript/modules/mesa3d.cmd
+++ b/buildscript/modules/mesa3d.cmd
@@ -230,7 +230,7 @@
 @if /I "%mesadbgoptim%"=="y" IF %toolchain%==msvc set buildconf=%buildconf% -Ddebug=true -Doptimization=3
 @if /I "%mesadbgoptim%"=="y" IF %toolchain%==msvc set /p nodebugprintf=Disable debug printf (y/n):
 @if /I "%mesadbgoptim%"=="y" IF %toolchain%==msvc echo.
-@if /I "%nodebugprintf%"=="y" set buildconf=%buildconf% --buildtype=release
+@if /I "%nodebugprintf%"=="y" set buildconf=%buildconf:~0,-17% --buildtype=release
 
 @set mesaenableasserts=n
 @set /p mesaenableasserts=Enable asserts (y/n):
diff --git a/buildscript/modules/mesonsubprojects.cmd b/buildscript/modules/mesonsubprojects.cmd
index 384cc9c..0071d4e 100644
--- a/buildscript/modules/mesonsubprojects.cmd
+++ b/buildscript/modules/mesonsubprojects.cmd
@@ -103,7 +103,7 @@ set "exitloop="
 @echo Using DirectX-Headers stable release...
 @for /f tokens^=2^ delims^=/^ eol^= %%a in ('git symbolic-ref --short refs/remotes/origin/HEAD 2^>^&^1') do @git checkout %%a
 @git pull -f --progress --tags --recurse-submodules origin
-@git checkout v1.613.1
+@git checkout v1.614.0
 @cd "%devroot%\mesa"
 )
 @if %gitstate% GTR 0 echo.
diff --git a/packages.txt b/packages.txt
index 4804cea..e84334f 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,6 +1,6 @@
-mesa3d-24.0.7-development-pack-msvc.7z
-..\mesa3d-24.0.7-release-msvc.7z
-..\mesa3d-24.0.7-debug-info-msvc.7z
-mesa3d-24.0.7-development-pack-mingw.7z
-..\mesa3d-24.0.7-release-mingw.7z
-..\mesa3d-24.0.7-debug-mingw.7z
+mesa3d-24.1.0-development-pack-msvc.7z
+..\mesa3d-24.1.0-release-msvc.7z
+..\mesa3d-24.1.0-debug-info-msvc.7z
+mesa3d-24.1.0-development-pack-mingw.7z
+..\mesa3d-24.1.0-release-mingw.7z
+..\mesa3d-24.1.0-debug-mingw.7z
diff --git a/readme.md b/readme.md
index 50f85ea..8f55aa0 100644
--- a/readme.md
+++ b/readme.md
@@ -24,7 +24,7 @@
 - [OpenGL context configuration override](#opengl-context-configuration-override)
 - [How to set environment variables](#how-to-set-environment-variables)
 # Downloads
-Mesa 24.0.7 builds with Visual Studio and MSYS2 Mingw-w64 are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases).
+Mesa 24.1.0 builds with Visual Studio and MSYS2 Mingw-w64 are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases).
 # Sponsorship
 mesa-dist-win project was given a sponsorship that was extended until November 1st 2024. Sponsorship consists in a free VPS to use as build machine with 12 GB RAM, 6 threads [AMD EPYC 7542](https://www.amd.com/en/products/cpu/amd-epyc-7542) and 150 GB NVMe SSD from [Petrosky](https://petrosky.io/pal1000), a virtual private server hosting company thanks to [@Directox01](https://github.com/Directox01).
 
diff --git a/releasenotes.md b/releasenotes.md
index 096026e..96f30a0 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,3 +1,5 @@
+# 24.1.0
+- Updated Mesa3D to [24.1.0](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.1/docs/relnotes/24.1.0.rst?ref_type=heads&plain=0). [24.0.8](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.0/docs/relnotes/24.0.8.rst?ref_type=heads&plain=0) MSVC build is also included.
 ### Debug
 - Standalone MinGW test: Minimal changes to unbreak it.
 ### Build script