Update OpenSSL 1.1.1 file names

no2101 · Apr 12, 2020 · b20a822 · b20a822
1 parent 1db1e6b
commit b20a822
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
@@ -88,8 +88,14 @@
                     <Component><File Source="$(var.QtPath)\bin\Qt5PrintSupport.dll" /></Component>
                     <Component><File Source="$(var.QtPath)\bin\Qt5Widgets.dll" /></Component>
                     <Component><File Source="$(var.QtPath)\bin\Qt5Xml.dll" /></Component>
-                    <Component><File Id="libcrypto.dll" Source="$(var.OpenSSLPath)\libcrypto-1_1.dll" /></Component>
-                    <Component><File Id="libssl.dll" Source="$(var.OpenSSLPath)\libssl-1_1.dll" /></Component>
+		    <!-- OpenSSL 1.1.1 -->
+                    <?if $(sys.BUILDARCH)="x64"?>
+                        <Component><File Id="libcrypto.dll" Source="$(var.OpenSSLPath)\libcrypto-1_1-x64.dll" /></Component>
+                        <Component><File Id="libssl.dll" Source="$(var.OpenSSLPath)\libssl-1_1-x64.dll" /></Component>
+                    <?elseif $(sys.BUILDARCH)="x86"?>
+                        <Component><File Id="libcrypto.dll" Source="$(var.OpenSSLPath)\libcrypto-1_1.dll" /></Component>
+                        <Component><File Id="libssl.dll" Source="$(var.OpenSSLPath)\libssl-1_1.dll" /></Component>
+                    <?endif?>
                     <Component><File Source="$(var.SQLCipherPath)\sqlcipher.dll" /></Component>
                     <Component><File Source="$(var.SQLitePath)\sqlite3.dll" /></Component>
                     <Component><File Source="$(var.SQLiteExePath)\DB Browser for SQLite.exe" Checksum="yes" /></Component>