X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=bc1bd39ded80a8b65de7b1a7e11b1312754f3a9e;hp=eaf68d81768583797722dbc9f9cdd1b557a69ea2;hb=8b9999744362603b448a74f779ff7a2b4d76c89d;hpb=2a624ff1daa841601aebca86c0196039da6978b3 diff --git a/win/yaz.nsi b/win/yaz.nsi index eaf68d8..bc1bd39 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -7,7 +7,6 @@ !include "MUI.nsh" -!define VS_REDIST_EXE vcredist_${VSARCH}.exe !define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio ${VSVER}.0\VC\redist\1033\${VS_REDIST_EXE}" ; For example can be found with regedit: @@ -18,6 +17,8 @@ !define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\6E8D947A316B3EB3F8F540C548BE2AB9" !endif !if "${VSVER}" = "14" +; Microsoft Visual C++ 2015 x64 Minimum Runtime - 14.0.23026 +!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\51E9E3D0A7EDB003691F4BFA219B4688" !endif InstallDir "$PROGRAMFILES64\YAZ" @@ -27,11 +28,18 @@ InstallDir "$PROGRAMFILES64\YAZ" !define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\21EE4A31AE32173319EEFE3BD6FDFFE3" !endif !if "${VSVER}" = "14" +; Microsoft Visual C++ 2015 x86 Minimum Runtime - 14.0.23026 +!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\55E3652ACEB38283D8765E8E9B8E6B57" !endif InstallDir "$PROGRAMFILES\YAZ" !endif +!if "${VSVER}" = "14" +!define VS_REDIST_EXE vc_redist.${VSARCH}.exe +!else +!define VS_REDIST_EXE vcredist_${VSARCH}.exe +!endif RequestExecutionLevel admin