diff --git a/pkg/gpxsee.nsi b/pkg/gpxsee.nsi index 8d5e7f87..65cf47d3 100644 --- a/pkg/gpxsee.nsi +++ b/pkg/gpxsee.nsi @@ -148,22 +148,11 @@ Section "MSVC runtime" SEC_MSVC SectionIn RO - DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..." - ${If} ${RunningX64} - ReadRegStr $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Version" - ${Else} - ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Version" - ${EndIf} + SetOutPath $TEMP + File "vc_redist.x86.exe" + ExecWait '"$TEMP\vc_redist.x86.exe" /install /quiet /norestart' + SetOutPath $INSTDIR - ${If} $R0 >= "v14.24.28127.04" - DetailPrint "Visual C++ 2017 runtime is already installed, skipping install." - ${Else} - DetailPrint "Installing Visual C++ 2017 Redistributable..." - SetOutPath $TEMP - File "vc_redist.x86.exe" - ExecWait '"$TEMP\vc_redist.x86.exe" /install /quiet /norestart' - SetOutPath $INSTDIR - ${EndIf} SectionEnd Section "OpenSSL" SEC_OPENSSL @@ -262,4 +251,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION) -!insertmacro MUI_FUNCTION_DESCRIPTION_END +!insertmacro MUI_FUNCTION_DESCRIPTION_END \ No newline at end of file diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index f756b768..e7d189d0 100644 --- a/pkg/gpxsee64.nsi +++ b/pkg/gpxsee64.nsi @@ -155,17 +155,11 @@ Section "MSVC runtime" SEC_MSVC SectionIn RO - DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..." - ReadRegStr $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Version" - ${If} $R0 >= "v14.24.28127.04" - DetailPrint "Visual C++ 2017 runtime is already installed, skipping install." - ${Else} - DetailPrint "Installing Visual C++ 2017 runtime..." - SetOutPath $TEMP - File "vc_redist.x64.exe" - ExecWait '"$TEMP\vc_redist.x64.exe" /install /quiet /norestart' - SetOutPath $INSTDIR - ${EndIf} + SetOutPath $TEMP + File "vc_redist.x64.exe" + ExecWait '"$TEMP\vc_redist.x64.exe" /install /quiet /norestart' + SetOutPath $INSTDIR + SectionEnd Section "OpenSSL" SEC_OPENSSL @@ -265,4 +259,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION) -!insertmacro MUI_FUNCTION_DESCRIPTION_END +!insertmacro MUI_FUNCTION_DESCRIPTION_END \ No newline at end of file