X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;fp=win%2Fyaz.nsi;h=9d923e6ed98051fab9ff57f22f99e4d70c23433f;hp=eaf68d81768583797722dbc9f9cdd1b557a69ea2;hb=a4a4e9d375bfbcc823e8b3820ffb23272e919004;hpb=917d2c4a288a19c0da7fa98ad514288d0e045413 diff --git a/win/yaz.nsi b/win/yaz.nsi index eaf68d8..9d923e6 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 x86 Minimum Runtime - 14.0.23026 +!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\55E3652ACEB38283D8765E8E9B8E6B57" !endif InstallDir "$PROGRAMFILES64\YAZ" @@ -27,8 +28,17 @@ InstallDir "$PROGRAMFILES64\YAZ" !define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\21EE4A31AE32173319EEFE3BD6FDFFE3" !endif !if "${VSVER}" = "14" +; Microsoft Visual C++ 2015 x64 Minimum Runtime - 14.0.23026 +!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\51E9E3D0A7EDB003691F4BFA219B4688" !endif +!if "${VSVER}" = "14" +!define VS_REDIST_EXE vc_redist.${VSARCH}.exe +!else +!define VS_REDIST_EXE vcredist_${VSARCH}.exe +!endif + + InstallDir "$PROGRAMFILES\YAZ" !endif