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

Include VC redistributable in the bundle

Browse Source
This commit is contained in:
Cameron Gutman 2018-07-25 19:52:58 -07:00
parent 718a575478
commit 26ee8564f8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/generate-installers.bat
View File

@ -20,7 +20,9 @@ if "%ARCH%" NEQ "x86" (
)
)
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
set VS_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community
call "%VS_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
if !ERRORLEVEL! NEQ 0 goto Error
set BUILD_ROOT=%cd%\build
@ -67,6 +69,7 @@ copy %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe %DEPLOY_FOLDER%
if !ERRORLEVEL! NEQ 0 goto Error
echo Building installer
set VCREDIST_INSTALLER=%VS_PATH%\VC\Redist\MSVC\14.14.26405\vcredist_%ARCH%.exe
msbuild %SOURCE_ROOT%\wix\Moonlight.sln /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
if !ERRORLEVEL! NEQ 0 goto Error

10
wix/MoonlightSetup/Bundle.wxs
View File

@ -24,6 +24,16 @@
</BootstrapperApplicationRef>
<Chain>
<ExePackage Cache="no"
PerMachine="yes"
Permanent="yes"
Vital="yes"
Compressed="yes"
SourceFile="$(env.VCREDIST_INSTALLER)"
InstallCommand="/install /quiet /norestart">
<!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" />
</ExePackage>
<MsiPackage Id="Moonlight" SourceFile="$(var.Moonlight.TargetPath)" Vital="yes">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
</MsiPackage>