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

Correct OpenSSL case

This commit is contained in:
Andrew Nelless 2017-02-07 15:25:04 +00:00
parent f8b7282db1
commit 5f3bf6ddeb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/setup/win32/Include.wxi
View File

@ -14,14 +14,14 @@
<?define ProgramFilesFolder="ProgramFiles64Folder" ?> <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
<?define PlatformSimpleName="64-bit" ?> <?define PlatformSimpleName="64-bit" ?>
<?define UpgradeGuid="$(var.UpgradeGuid64)" ?> <?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
<?define var.OpensslPath="openssl/win64" ?> <?define var.OpenSSLPath="openssl/win64" ?>
<?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?> <?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?> <?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
<?else ?> <?else ?>
<?define ProgramFilesFolder="ProgramFilesFolder" ?> <?define ProgramFilesFolder="ProgramFilesFolder" ?>
<?define PlatformSimpleName="32-bit" ?> <?define PlatformSimpleName="32-bit" ?>
<?define UpgradeGuid="$(var.UpgradeGuid32)" ?> <?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
<?define var.OpensslPath="openssl/win32" ?> <?define var.OpenSSLPath="openssl/win32" ?>
<?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?> <?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?> <?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
<?endif ?> <?endif ?>

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

@ -12,7 +12,7 @@
</Upgrade> </Upgrade>
<Feature Id="ProductFeature" Title="$(var.Name)"> <Feature Id="ProductFeature" Title="$(var.Name)">
<ComponentGroupRef Id="ProductComponents"/> <ComponentGroupRef Id="ProductComponents"/>
<ComponentGroupRef Id="OpenSslComponents"/> <ComponentGroupRef Id="OpenSSLComponents"/>
<ComponentGroupRef Id="ProductQtPluginComponents"/> <ComponentGroupRef Id="ProductQtPluginComponents"/>
<MergeRef Id="CRT"/> <MergeRef Id="CRT"/>
<ComponentRef Id="RegistryEntries"/> <ComponentRef Id="RegistryEntries"/>
@ -49,7 +49,7 @@
<Directory Id="$(var.ProgramFilesFolder)"> <Directory Id="$(var.ProgramFilesFolder)">
<Directory Id="INSTALLFOLDER" Name="$(var.Name)"> <Directory Id="INSTALLFOLDER" Name="$(var.Name)">
<Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/> <Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/>
<Directory Id="OpenSslDir" Name="OpenSSL"/> <Directory Id="OpenSSLDir" Name="OpenSSL"/>
<Directory Id="PlatformsDir" Name="Platforms"/> <Directory Id="PlatformsDir" Name="Platforms"/>
</Directory> </Directory>
</Directory> </Directory>
@ -92,11 +92,11 @@
<File Source="$(var.QtPlatformPath)\qwindows.dll"/> <File Source="$(var.QtPlatformPath)\qwindows.dll"/>
</Component> </Component>
</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.ExtPath)/$(var.OpenSSLPath)/bin/libeay32.dll"/>
<File Id="OpenSslDll2" Source="$(var.ExtPath)/$(var.OpensslPath)/bin/ssleay32.dll"/> <File Id="OpenSSLDll2" Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/ssleay32.dll"/>
<File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/openssl.exe"/> <File Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/openssl.exe"/>
<File Source="$(var.ResPath)/openssl/synergy.conf"/> <File Source="$(var.ResPath)/openssl/synergy.conf"/>
</Component> </Component>
</ComponentGroup> </ComponentGroup>