Skip to content

Commit 00d8be0

Browse files
lstipakovcron2
authored andcommitted
windows-msi: add vcruntime.dll
Since we start to build releases with MSVC, (and for ARM64 this is the only option), VC runtime library needs to be bundled. The recommended way to include it is to use MSMs: https://devblogs.microsoft.com/cppblog/how-to-redistribute-the-visual-c-libraries-with-your-application/ However as for now there is no MSM for ARM64 available, so we do "app-local" deployment and copy required DLL (vcruntime140.dll) to bin directory. DLLs were obtainted from: C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Redist\MSVC\14.29.30036 Signed-off-by: Lev Stipakov <lev@openvpn.net>
1 parent 9ab8e94 commit 00d8be0

File tree

5 files changed

+5
-0
lines changed

5 files changed

+5
-0
lines changed

windows-msi/build.wsf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ clean Cleans intermediate and output files</example>
243243
BuildPath(p.openVPNPath, "bin", "openvpn-gui.exe"),
244244
BuildPath(p.openVPNPath, "bin", "openvpnserv.exe"),
245245
BuildPath(p.openVPNPath, "bin", "tapctl.exe"),
246+
BuildPath("vcredist", p.wixPlat, "vcruntime140.dll"),
246247
BuildPath(buildPath, "openvpnserv2.exe"),
247248
BuildPath(buildPath, "README-config.txt"),
248249
BuildPath(buildPath, "Where are my config files.txt"),

windows-msi/msi.wxs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,9 @@
725725
</Component>
726726

727727
<Directory Id="BINDIR" Name="bin">
728+
<Component Id="bin.vcruntime140.dll" Guid="{B4440841-D2A6-4E2C-9B59-67591311F955}">
729+
<File Name="vcruntime140.dll" Source="vcredist\$(sys.BUILDARCH)\vcruntime140.dll"/>
730+
</Component>
728731
<Component Id="bin.libcrypto_1_1.dll" Guid="{811694A9-DC99-4CFA-BD72-4877F8E32C7C}">
729732
<File Name="libcrypto-1_1$(var.OPENSSL_PLAT).dll" Source="!(bindpath.openvpn)bin\libcrypto-1_1$(var.OPENSSL_PLAT).dll"/>
730733
</Component>
@@ -1463,6 +1466,7 @@
14631466
AllowAdvertise="no"
14641467
Display="expand">
14651468
<ComponentRef Id="license.txt"/>
1469+
<ComponentRef Id="bin.vcruntime140.dll"/>
14661470
<ComponentRef Id="bin.libcrypto_1_1.dll"/>
14671471
<ComponentRef Id="bin.liblzo2_2.dll"/>
14681472
<ComponentRef Id="bin.libpkcs11_helper_1.dll"/>
185 KB
Binary file not shown.
94.9 KB
Binary file not shown.
74.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)