From 8687711745b9aa610e3b0f20440409b214fb2f60 Mon Sep 17 00:00:00 2001 From: Anton Filimonov Date: Tue, 20 Oct 2020 19:17:35 +0300 Subject: [PATCH] Try fix installer for win (#222) --- packaging/windows/klogg.nsi | 2 ++ packaging/windows/prepare_release.cmd | 1 + 2 files changed, 3 insertions(+) diff --git a/packaging/windows/klogg.nsi b/packaging/windows/klogg.nsi index b979bb11b..61fbea11b 100644 --- a/packaging/windows/klogg.nsi +++ b/packaging/windows/klogg.nsi @@ -122,6 +122,7 @@ SectionEnd Section "MSVC Runtime libraries" vcruntime SetOutPath $INSTDIR File release\msvcp140.dll + File release\msvcp140_1.dll File release\vcruntime140.dll !if ${PLATFORM} == "x64" @@ -184,6 +185,7 @@ Section "Uninstall" Delete "$INSTDIR\platforms\qminimal.dll" Delete "$INSTDIR\styles\qwindowsvistastyle.dll" Delete "$INSTDIR\msvcp140.dll" + Delete "$INSTDIR\msvcp140_1.dll" Delete "$INSTDIR\vcruntime140.dll" Delete "$INSTDIR\vcruntime140_1.dll" Delete "$INSTDIR\tbbmalloc.dll" diff --git a/packaging/windows/prepare_release.cmd b/packaging/windows/prepare_release.cmd index 6afdca065..d08876415 100644 --- a/packaging/windows/prepare_release.cmd +++ b/packaging/windows/prepare_release.cmd @@ -24,6 +24,7 @@ xcopy %KLOGG_WORKSPACE%\README.md %KLOGG_WORKSPACE%\release\ /y xcopy %KLOGG_WORKSPACE%\DOCUMENTATION.md %KLOGG_WORKSPACE%\release\ /y xcopy "%VCToolsRedistDir%%platform%\Microsoft.VC142.CRT\msvcp140.dll" %KLOGG_WORKSPACE%\release\ /y +xcopy "%VCToolsRedistDir%%platform%\Microsoft.VC142.CRT\msvcp140_1.dll" %KLOGG_WORKSPACE%\release\ /y xcopy "%VCToolsRedistDir%%platform%\Microsoft.VC142.CRT\vcruntime140.dll" %KLOGG_WORKSPACE%\release\ /y xcopy "%VCToolsRedistDir%%platform%\Microsoft.VC142.CRT\vcruntime140_1.dll" %KLOGG_WORKSPACE%\release\ /y