Try fix installer for win (nickbnf#222)

danberindei · Oct 20, 2020 · 8687711 · 8687711
1 parent 0c3c94e
commit 8687711
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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