rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix OpenSSL binary paths in WiX

This commit is contained in:
Andrew Nelless 2017-02-08 15:21:14 +00:00
parent 4263fd1717
commit 8f17659d43
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/setup/win32/Include.wxi.in
View File

@ -21,5 +21,6 @@
<?define QtBinPath="$(var.QtPath)\bin" ?> <?define QtBinPath="$(var.QtPath)\bin" ?>
<?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?> <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
<?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?> <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
<?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?> <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
</Include> </Include>

10
src/setup/win32/Product.wxs
View File

@ -70,8 +70,8 @@
<File Source="$(var.BinPath)/synergyc.exe"/> <File Source="$(var.BinPath)/synergyc.exe"/>
<File Source="$(var.BinPath)/syntool.exe"/> <File Source="$(var.BinPath)/syntool.exe"/>
<File Source="$(var.BinPath)/synwinhk.dll"/> <File Source="$(var.BinPath)/synwinhk.dll"/>
<File Source="$(var.BinPath)/libeay32.dll"/> <File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
<File Source="$(var.BinPath)/ssleay32.dll"/> <File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
</Component> </Component>
<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui"> <Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe"> <File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
@ -94,9 +94,9 @@
</ComponentGroup> </ComponentGroup>
<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents"> <ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL"> <Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
<File Id="OpenSSLDll1" Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/libeay32.dll"/> <File Id="OpenSSLDll1" Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
<File Id="OpenSSLDll2" Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/ssleay32.dll"/> <File Id="OpenSSLDll2" Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
<File Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/openssl.exe"/> <File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
<File Source="$(var.ResPath)/openssl/synergy.conf"/> <File Source="$(var.ResPath)/openssl/synergy.conf"/>
</Component> </Component>
</ComponentGroup> </ComponentGroup>