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

#5389 Added qwindows.dll into installer on Windows

This commit is contained in:
Jerry (Xinyu Hou) 2016-06-24 19:05:25 +01:00
parent 9897711967
commit 4ad8621adc
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,8 @@
<?define ExtPath="../../../ext" ?> <?define ExtPath="../../../ext" ?>
<?define QtMajor="5" ?> <?define QtMajor="5" ?>
<?define QtPath="C:\Qt\5.6\mingw49_32\bin" ?> <?define QtPath="C:\Qt\5.6\mingw49_32\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\mingw49_32\plugins\platforms" ?>
<?ifndef Version ?> <?ifndef Version ?>
<?define Version="1.0.0" ?> <?define Version="1.0.0" ?>
<?endif?> <?endif?>

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

@ -28,6 +28,7 @@
<ComponentGroupRef Id="ProductComponents" /> <ComponentGroupRef Id="ProductComponents" />
<ComponentGroupRef Id="OpenSslComponents" /> <ComponentGroupRef Id="OpenSslComponents" />
<ComponentGroupRef Id="PluginsComponents" /> <ComponentGroupRef Id="PluginsComponents" />
<ComponentGroupRef Id="ProductQtPluginComponents" />
<MergeRef Id="CRT" /> <MergeRef Id="CRT" />
</Feature> </Feature>
@ -71,6 +72,7 @@
<Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" /> <Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" />
<Directory Id="OpenSslDir" Name="OpenSSL" /> <Directory Id="OpenSslDir" Name="OpenSSL" />
<Directory Id="PluginsDir" Name="Plugins" /> <Directory Id="PluginsDir" Name="Plugins" />
<Directory Id="PlatformsDir" Name="Platforms" />
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="ProgramMenuFolder" /> <Directory Id="ProgramMenuFolder" />
@ -142,6 +144,12 @@
</ComponentGroup> </ComponentGroup>
<ComponentGroup Id="ProductQtPluginComponents" Directory="PlatformsDir">
<Component Id="QtPlatformPlugin" Guid="684EFA14-856B-440E-A5E6-E90E04E36B41">
<File Source="$(var.QtPlatformPath)\qwindows.dll" />
</Component>
</ComponentGroup>
<ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir"> <ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir">
<Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1"> <Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1">
<File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/libeay32.dll" Id="OpenSslDll1" /> <File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/libeay32.dll" Id="OpenSslDll1" />