Skip to content

Commit

Permalink
Attempt #1 to work around WiX error CNDL0014
Browse files Browse the repository at this point in the history 
WiX doesn't seem to like the hyphen character ("-") being used
in Id's, which is a problem as it's used in the OpenSSL library
filenames.
  • Loading branch information
@justinclift
justinclift committed Apr 12, 2020
1 parent c1ac897 commit 1db1e6b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions installer/windows/product.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<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 Source="$(var.OpenSSLPath)\libcrypto-1_1.dll" /></Component>
<Component><File Source="$(var.OpenSSLPath)\libssl-1_1.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>
<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>
Expand Down Expand Up @@ -181,8 +181,8 @@
<ComponentRef Id="Qt5Widgets.dll" />
<ComponentRef Id="Qt5Xml.dll" />
<!-- OpenSSL -->
<ComponentRef Id="libcrypto-1_1.dll" />
<ComponentRef Id="libssl-1_1.dll" />
<ComponentRef Id="libcrypto.dll" />
<ComponentRef Id="libssl.dll" />
<!-- SQLite & SQLCipher -->
<ComponentRef Id="sqlcipher.dll" />
<ComponentRef Id="sqlite3.dll" />
Expand Down

0 comments on commit 1db1e6b

Please sign in to comment.