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

#5389 Updated Wix for Qt 5.6 and VS 2015

This commit is contained in:
Jerry (Xinyu Hou) 2016-06-23 19:34:34 +01:00
parent 70bdbe2736
commit 454bf4dc5f
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,8 @@
<?define BinPath="../../../bin/$(var.Configuration)" ?> <?define BinPath="../../../bin/$(var.Configuration)" ?>
<?define ResPath="../../../res" ?> <?define ResPath="../../../res" ?>
<?define ExtPath="../../../ext" ?> <?define ExtPath="../../../ext" ?>
<?define QtPath="C:\Qt\2010.02\qt\bin" ?> <?define QtMajor="5" ?>
<?define QtPath="C:\Qt\5.6\mingw49_32\bin" ?>
<?ifndef Version ?> <?ifndef Version ?>
<?define Version="1.0.0" ?> <?define Version="1.0.0" ?>
@ -28,6 +29,6 @@
<?define var.OpensslPath="openssl-win32" ?> <?define var.OpensslPath="openssl-win32" ?>
<?endif?> <?endif?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_$(var.Platform).msm" ?> <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
</Include> </Include>

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

@ -14,7 +14,7 @@
Version="$(var.Version)" Version="$(var.Version)"
Manufacturer="$(var.Author)"> Manufacturer="$(var.Author)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" /> <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed." />
<MediaTemplate EmbedCab="yes" /> <MediaTemplate EmbedCab="yes" />
<UIRef Id="WixUI_InstallDir" /> <UIRef Id="WixUI_InstallDir" />
@ -119,11 +119,22 @@
<fire:FirewallException Id="GuiFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" /> <fire:FirewallException Id="GuiFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" />
</File> </File>
<File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" /> <?if 5 = $(var.QtMajor) ?>
<File Source="$(var.QtPath)\mingwm10.dll" /> <File Source="$(var.QtPath)\Qt5Core.dll" />
<File Source="$(var.QtPath)\QtCore4.dll" /> <File Source="$(var.QtPath)\Qt5Gui.dll" />
<File Source="$(var.QtPath)\QtGui4.dll" /> <File Source="$(var.QtPath)\Qt5Network.dll" />
<File Source="$(var.QtPath)\QtNetwork4.dll" /> <File Source="$(var.QtPath)\Qt5Svg.dll" />
<File Source="$(var.QtPath)\Qt5Widgets.dll" />
<File Source="$(var.QtPath)\libGLESV2.dll" />
<File Source="$(var.QtPath)\libEGL.dll" />
<File Source="$(var.QtPath)\libstdc++-6.dll" />
<File Source="$(var.QtPath)\libwinpthread-1.dll" />
<?else?>
<File Source="$(var.QtPath)\mingwm10.dll" CompanionFile="GuiProgram" />
<File Source="$(var.QtPath)\QtCore4.dll" CompanionFile="GuiProgram" />
<File Source="$(var.QtPath)\QtGui4.dll" CompanionFile="GuiProgram" />
<File Source="$(var.QtPath)\QtNetwork4.dll" CompanionFile="GuiProgram" />
<?endif?>
<File Source="$(var.ExtPath)\bonjour\x64\dnssd.dll" /> <File Source="$(var.ExtPath)\bonjour\x64\dnssd.dll" />

13
src/setup/win32/synergy.sln
View File

@ -1,6 +1,8 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2010 # Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "synergy", "synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}" Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "synergy", "synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
EndProject EndProject
Global Global
@ -11,14 +13,13 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x86
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x64 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x86
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.Build.0 = Debug|x64 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x86
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x64
{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE