msi: remove LZO dll

Patch https://patchwork.openvpn.net/patch/2293/ links LZO statically, so we don't need LZO DLL anymore.
lawtancool · Feb 16, 2022 · 72892f1 · 72892f1
1 parent f579255
commit 72892f1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/windows-msi/build.wsf b/windows-msi/build.wsf
@@ -168,8 +168,7 @@ clean	Cleans intermediate and output files</example>
                             "-dUPGRADE_CODE=\""                 + _CMD(ver.define["UPGRADE_CODE_" + plat        ]) + "\"",
                             "-dCONFIG_EXTENSION=\""             + _CMD(ver.define["CONFIG_EXTENSION"            ]) + "\"",
                             "-dPROGRAM_FILES_DIR=\""            + _CMD(p.programFilesPath                        ) + "\"",
-                            "-dOPENSSL_PLAT=\""                 + _CMD(p.openSSLPlat                             ) + "\"",
-                            "-dLZO_DLL=\""                      + _CMD("lzo2.dll"                                ) + "\""];
+                            "-dOPENSSL_PLAT=\""                 + _CMD(p.openSSLPlat                             ) + "\""];
 
                         // WiX compiling
                         b.pushRule(new WiXCompileBuildRule(
@@ -237,7 +236,6 @@ clean	Cleans intermediate and output files</example>
                                 BuildPath(p.buildPath, "tap-windows6.msm"),
                                 BuildPath(p.buildPath, "wintun.msm"),
                                 BuildPath(p.openVPNBinPath, "libcrypto-1_1" + p.openSSLPlat + ".dll"),
-                                BuildPath(p.openVPNBinPath, "lzo2.dll"),
                                 BuildPath(p.openVPNBinPath, "libopenvpnmsica.dll"),
                                 BuildPath(p.openVPNBinPath, "libpkcs11-helper-1.dll"),
                                 BuildPath(p.openVPNBinPath, "libssl-1_1" + p.openSSLPlat + ".dll"),

diff --git a/windows-msi/msi.wxs b/windows-msi/msi.wxs
@@ -731,9 +731,6 @@
                         <Component Id="bin.libcrypto_1_1.dll" Guid="{811694A9-DC99-4CFA-BD72-4877F8E32C7C}">
                             <File Name="libcrypto-1_1$(var.OPENSSL_PLAT).dll" Source="!(bindpath.openvpnbin)libcrypto-1_1$(var.OPENSSL_PLAT).dll"/>
                         </Component>
-                        <Component Id="bin.liblzo2_2.dll" Guid="{A1A057F0-235B-4F55-9A3A-CDA2112648F8}">
-                            <File Name="$(var.LZO_DLL)" Source="!(bindpath.openvpnbin)$(var.LZO_DLL)"/>
-                        </Component>
                         <Component Id="bin.libpkcs11_helper_1.dll" Guid="{62BB5466-934A-41FE-989B-9D0B6BD5151F}">
                             <File Name="libpkcs11-helper-1.dll" Source="!(bindpath.openvpnbin)libpkcs11-helper-1.dll"/>
                         </Component>
@@ -1479,7 +1476,6 @@
             <ComponentRef Id="license.txt"/>
             <ComponentRef Id="bin.vcruntime140.dll"/>
             <ComponentRef Id="bin.libcrypto_1_1.dll"/>
-            <ComponentRef Id="bin.liblzo2_2.dll"/>
             <ComponentRef Id="bin.libpkcs11_helper_1.dll"/>
             <ComponentRef Id="bin.libssl_1_1.dll"/>
             <ComponentRef Id="bin.openvpn.exe"/>