@@ -28,6 +28,17 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
2828 <?define OpenSSLSuffix = " " ?>
2929<?endif ?>
3030
31+ <?if $(env.VisualStudioVersion) = " 16.0" ?>
32+ <?define VCVER = " 142" ?>
33+ <?define VCPATH = " $(env.VCTOOLSREDISTDIR)" ?>
34+ <?elseif $(env.VisualStudioVersion) = " 15.0" ?>
35+ <?define VCVER = " 141" ?>
36+ <?define VCPATH = " $(env.VCTOOLSREDISTDIR)" ?>
37+ <?elseif $(env.VisualStudioVersion) = " 14.0" ?>
38+ <?define VCVER = " 140" ?>
39+ <?define VCPATH = " $(env.VCINSTALLDIR)\redist" ?>
40+ <?endif ?>
41+
3142<Wix xmlns =" http://schemas.microsoft.com/wix/2006/wi" >
3243 <Product Name =" DigiDoc4 Client" UpgradeCode =" 67932072-aa9e-45e3-b697-d825349f273d"
3344 Id =" *" Language =" 1033" Version =" $(var.MSI_VERSION)" Codepage =" 1251" Manufacturer =" RIA" >
@@ -140,6 +151,11 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
140151 Name =" digidoc.ini" Key =" CA_CERT_PATH" Value =" [APPLICATIONFOLDER]certs" />
141152<?endif ?>
142153<?ifdef var .qt_path ?>
154+ <File Source =" $(var.VCPATH)\$(var.Platform)\Microsoft.VC$(var.VCVER).CRT\msvcp140.dll" />
155+ <File Source =" $(var.VCPATH)\$(var.Platform)\Microsoft.VC$(var.VCVER).CRT\vcruntime140.dll" />
156+ <!-- ?if $(env.VisualStudioVersion) = "16.0" ?>
157+ <File Source="$(var.VCPATH)\$(var.Platform)\Microsoft.VC$(var.VCVER).CRT\vcruntime140_1.dll"/>
158+ <?endif ?-->
143159 <File Source =" $(var.ssl_path)\libcrypto-1_1$(var.OpenSSLSuffix).dll" />
144160 <File Source =" $(var.ssl_path)\libssl-1_1$(var.OpenSSLSuffix).dll" />
145161 <File Source =" $(var.qt_path)\bin\Qt5Core.dll" />
0 commit comments