diff --git a/pri/install.pri b/pri/install.pri index 50d4e58a6..d2ccad7b6 100644 --- a/pri/install.pri +++ b/pri/install.pri @@ -23,10 +23,13 @@ win32 { lib.path = $$PREFIX lib.CONFIG = no_check_exist + redist10.files = ../../resources/scripts/redist/* + redist10.path = $$PREFIX + clng.files = ../../resources/scripts/clang-format clng.path = $$PREFIX - INSTALLS += target lib clng + INSTALLS += target lib clng clng.path = $$PREFIX INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard) } diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in index 17bd92f61..d283f7615 100755 --- a/resources/nsis/NSIS.template.in +++ b/resources/nsis/NSIS.template.in @@ -131,6 +131,12 @@ NotInstalled: ExecWait '"$INSTDIR\vc_redist.x64.exe" /install /quiet /norestart' Delete "$INSTDIR\vc_redist.x64.exe" + ExecWait '"$INSTDIR\vcredist_2010.x86.exe" /q /norestart' + Delete "$INSTDIR\vcredist_2010.x86.exe" + + ExecWait '"$INSTDIR\vcredist_2010.x64.exe" /q /norestart' + Delete "$INSTDIR\vcredist_2010.x64.exe" + ; Create uninstaller. WriteUninstaller "$INSTDIR\Uninstall.exe" diff --git a/resources/scripts/redist/vcredist_2010.x64.exe b/resources/scripts/redist/vcredist_2010.x64.exe new file mode 100755 index 000000000..6ae64fb4f Binary files /dev/null and b/resources/scripts/redist/vcredist_2010.x64.exe differ diff --git a/resources/scripts/redist/vcredist_2010.x86.exe b/resources/scripts/redist/vcredist_2010.x86.exe new file mode 100755 index 000000000..57e15c0bc Binary files /dev/null and b/resources/scripts/redist/vcredist_2010.x86.exe differ