From fc36542d86884eec6df450f3446e9631386a094c Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Thu, 23 Sep 2021 22:35:45 +0200 Subject: [PATCH] Update Windows build --- app/build.bat | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/app/build.bat b/app/build.bat index 733a1bb..48c7694 100644 --- a/app/build.bat +++ b/app/build.bat @@ -67,34 +67,25 @@ 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" ( - 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%\ - ) + xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140.dll ..\dist\%WIN%\ + 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\ ( - 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%\ - ) + xcopy /Q /Y %SYSTEMROOT%\SysWOW64\msvcp140.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\SysWOW64\vcruntime140.dll ..\dist\%WIN%\ + 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\ ( - 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%\ - ) + xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\msvcp140_1.dll ..\dist\%WIN%\ + xcopy /Q /Y %SYSTEMROOT%\System32\vcruntime140_1.dll ..\dist\%WIN%\ ) )