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

Cleanup WiX and make it configuration ready

This commit is contained in:
Andrew Nelless 2017-02-07 16:41:58 +00:00
parent 5f3bf6ddeb
commit 9fbec1184e
3 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<?define Name="Synergy" ?>
<?define Author="Symless Ltd" ?>
<?define BinPath="../../../bin/$(var.Configuration)" ?>
<?define ResPath="../../../res" ?>
<?define ExtPath="../../../ext" ?>
<?ifndef Version ?>
<?define Version="1.0.0" ?>
<?endif ?>
<?define UpgradeGuid32="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
<?define UpgradeGuid64="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
<?if $(var.Platform) = "x64" ?>
<?define ProgramFilesFolder="ProgramFiles64Folder" ?>
<?define PlatformSimpleName="64-bit" ?>
<?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
<?define var.OpenSSLPath="openssl/win64" ?>
<?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
<?else ?>
<?define ProgramFilesFolder="ProgramFilesFolder" ?>
<?define PlatformSimpleName="32-bit" ?>
<?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
<?define var.OpenSSLPath="openssl/win32" ?>
<?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
<?endif ?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
</Include>

25
src/setup/win32/Include.wxi.in Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<?define Name="Synergy" ?>
<?define Version="1.9.0" ?> <!-- TODO: Configure this externally //-->
<?define QtVersion="5.8" ?> <!-- TODO: Configure this externally //-->
<?define Author="Symless Ltd" ?>
<?define BinPath="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\$(var.Configuration)" ?>
<?define ResPath="${CMAKE_CURRENT_SOURCE_DIR}\res" ?>
<?define ExtPath="${CMAKE_CURRENT_SOURCE_DIR}\ext" ?>
<?if $(var.Platform) = "x64" ?>
<?define ProgramFilesFolder="ProgramFiles64Folder" ?>
<?define PlatformSimpleName="64-bit" ?>
<?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
<?define QtPath="C:\Qt\$(var.QtVersion)\msvc2015_64" ?>
<?else ?>
<?define ProgramFilesFolder="ProgramFilesFolder" ?>
<?define PlatformSimpleName="32-bit" ?>
<?define UpgradeGuid="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
<?define QtPath="C:\Qt\$(var.QtVersion)\msvc2015" ?>
<?endif ?>
<?define QtBinPath="$(var.QtPath)\bin" ?>
<?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
<?define OpenSSLPath="$(var.ExtPath)\openssl\$(var.Platform)" ?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
</Include>

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

@ -78,13 +78,13 @@
<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.ico" Id="GuiShortcut" Name="$(var.Name)"/>
<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
</File>
<File Source="$(var.QtPath)\Qt5Core.dll"/>
<File Source="$(var.QtPath)\Qt5Gui.dll"/>
<File Source="$(var.QtPath)\Qt5Network.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.QtBinPath)\Qt5Core.dll"/>
<File Source="$(var.QtBinPath)\Qt5Gui.dll"/>
<File Source="$(var.QtBinPath)\Qt5Network.dll"/>
<File Source="$(var.QtBinPath)\Qt5Svg.dll"/>
<File Source="$(var.QtBinPath)\Qt5Widgets.dll"/>
<File Source="$(var.QtBinPath)\libGLESv2.dll"/>
<File Source="$(var.QtBinPath)\libEGL.dll"/>
</Component>
</ComponentGroup>
<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">