From d742319797213bb1f8989deb0f7aadd2a5d82c17 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Thu, 23 Sep 2021 21:55:49 +0200 Subject: [PATCH] Update redist --- app/build.bat | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/app/build.bat b/app/build.bat index 30c9745..733a1bb 100644 --- a/app/build.bat +++ b/app/build.bat @@ -67,19 +67,34 @@ rename ..\dist\%WIN%\SysTray_X.json.template SysTray_X.json C:\Qt\%QT_VER%\%SPEC%\bin\windeployqt.exe ..\dist\%WIN%\SysTray-X.exe if "%WIN%" == "win64" ( - xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140.dll ..\dist\%WIN%\ - xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140.dll ..\dist\%WIN%\ + if "%QT_VER%"=="5.14.2" ( + xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140.dll ..\dist\%WIN%\ + ) else ( + xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140_1.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140_1.dll ..\dist\%WIN%\ + ) ) if "%WIN%" == "win32" ( if exist %SYSTEMROOT%\SysWOW64\ ( - xcopy /Q /Y %SYSTEMROOT%\SysWOW64\msvcp140.dll ..\dist\%WIN%\ - xcopy /Q /Y %SYSTEMROOT%\SysWOW64\vcruntime140.dll ..\dist\%WIN%\ + if "%QT_VER%"=="5.14.2" ( + xcopy /Q /Y %SYSTEMROOT%\SysWOW64\msvcp140.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\SysWOW64\vcruntime140.dll ..\dist\%WIN%\ + ) else ( + xcopy /Q /Y %SYSTEMROOT%\SysWOW64\msvcp140_1.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\SysWOW64\vcruntime140_1.dll ..\dist\%WIN%\ + ) ) if not exist %SYSTEMROOT%\SysWOW64\ ( - xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140.dll ..\dist\%WIN%\ - xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140.dll ..\dist\%WIN%\ + if "%QT_VER%"=="5.14.2" ( + xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140.dll ..\dist\%WIN%\ + ) else ( + xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140_1.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140_1.dll ..\dist\%WIN%\ + ) ) )