diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in index c092fb4f5..b125c6ee1 100755 --- a/resources/nsis/NSIS.template.in +++ b/resources/nsis/NSIS.template.in @@ -137,16 +137,6 @@ NotInstalled: WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S" - - ; Install MSVCRT libraries. - ExecWait '"$INSTDIR\vc_redist.x64.exe" /norestart' - Delete "$INSTDIR\vc_redist.x64.exe" - - ExecWait '"$INSTDIR\vc_redist_2010.x86.exe" /norestart' - Delete "$INSTDIR\vc_redist_2010.x86.exe" - - ExecWait '"$INSTDIR\vc_redist_2010.x64.exe" /norestart' - Delete "$INSTDIR\vc_redist_2010.x64.exe" SectionEnd Section "Desktop Icon" DesktopIcon diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index fd762a85c..f1e305da8 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -64,7 +64,7 @@ cd "src\rssguard" nmake.exe install cd "app" -windeployqt.exe --verbose 1 --compiler-runtime --no-translations --release rssguard.exe librssguard.dll +windeployqt.exe --verbose 1 --no-compiler-runtime --no-translations --release rssguard.exe librssguard.dll cd ".." # Copy OpenSSL. diff --git a/resources/scripts/redist/msvcp100.dll b/resources/scripts/redist/msvcp100.dll new file mode 100755 index 000000000..3db6026de Binary files /dev/null and b/resources/scripts/redist/msvcp100.dll differ diff --git a/resources/scripts/redist/msvcp140.dll b/resources/scripts/redist/msvcp140.dll new file mode 100755 index 000000000..fdc5eebb2 Binary files /dev/null and b/resources/scripts/redist/msvcp140.dll differ diff --git a/resources/scripts/redist/msvcp140_1.dll b/resources/scripts/redist/msvcp140_1.dll new file mode 100755 index 000000000..60efb919c Binary files /dev/null and b/resources/scripts/redist/msvcp140_1.dll differ diff --git a/resources/scripts/redist/msvcr100.dll b/resources/scripts/redist/msvcr100.dll new file mode 100755 index 000000000..0cbdec9fe Binary files /dev/null and b/resources/scripts/redist/msvcr100.dll differ diff --git a/resources/scripts/redist/ucrtbase.dll b/resources/scripts/redist/ucrtbase.dll new file mode 100755 index 000000000..238216831 Binary files /dev/null and b/resources/scripts/redist/ucrtbase.dll differ diff --git a/resources/scripts/redist/vc_redist_2010.x64.exe b/resources/scripts/redist/vc_redist_2010.x64.exe deleted file mode 100755 index 6ae64fb4f..000000000 Binary files a/resources/scripts/redist/vc_redist_2010.x64.exe and /dev/null differ diff --git a/resources/scripts/redist/vc_redist_2010.x86.exe b/resources/scripts/redist/vc_redist_2010.x86.exe deleted file mode 100755 index 57e15c0bc..000000000 Binary files a/resources/scripts/redist/vc_redist_2010.x86.exe and /dev/null differ diff --git a/resources/scripts/redist/vcruntime140.dll b/resources/scripts/redist/vcruntime140.dll new file mode 100755 index 000000000..8974ee3d0 Binary files /dev/null and b/resources/scripts/redist/vcruntime140.dll differ diff --git a/resources/scripts/redist/vcruntime140_1.dll b/resources/scripts/redist/vcruntime140_1.dll new file mode 100755 index 000000000..b176c9d54 Binary files /dev/null and b/resources/scripts/redist/vcruntime140_1.dll differ