moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 15:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always install the VC redistributable

Browse Source
This commit is contained in:
Cameron Gutman 2019-09-30 00:11:37 -07:00
parent 12526bfca4
commit 4d2965e74f
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wix/MoonlightSetup/Bundle.wxs
View File

@ -17,21 +17,6 @@
<![CDATA[VersionNT >= v6.1]]> <![CDATA[VersionNT >= v6.1]]>
</bal:Condition> </bal:Condition>
<!-- https://stackoverflow.com/questions/46637094/how-can-i-find-the-upgrade-code-for-an-installed-msi-file -->
<?if $(env.ARCH) ~= x86 ?>
<util:ProductSearch Id="Find_VCRedist_x86"
UpgradeCode="{C78B8E51-0C65-377E-85D1-282F689FE505}"
Result="state"
Variable="VCRedist_Present" />
<?elseif $(env.ARCH) ~= x64 ?>
<util:ProductSearch Id="Find_VCRedist_x64"
UpgradeCode="{9B0BAA88-E15F-3A1F-ACC0-B206E9DDF71C}"
Result="state"
Variable="VCRedist_Present" />
<?else ?>
<?error Bad ARCH value ?>
<?endif ?>
<?if $(env.ARCH) ~= x64 ?> <?if $(env.ARCH) ~= x64 ?>
<bal:Condition Message="This Moonlight installer requires a 64-bit (x64) OS. Please download the 32-bit (x86) installer."> <bal:Condition Message="This Moonlight installer requires a 64-bit (x64) OS. Please download the 32-bit (x86) installer.">
VersionNT64 VersionNT64
@ -83,7 +68,6 @@
<ExePackage Cache="no" <ExePackage Cache="no"
PerMachine="yes" PerMachine="yes"
Permanent="yes" Permanent="yes"
InstallCondition="VCRedist_Present = 2"
Vital="yes" Vital="yes"
Compressed="yes" Compressed="yes"
SourceFile="$(env.VCToolsRedistDir)vcredist_$(env.ARCH).exe" SourceFile="$(env.VCToolsRedistDir)vcredist_$(env.ARCH).exe"