Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Alchemy sync] Switch from shipping vc_redist to shipping the dll's from the build host.

Browse Source
This commit is contained in:
Router Gray
2019-07-29 23:04:26 -05:00
parent 565153c5f7
commit dc77a053ea
7 changed files with 776 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/installers/windows/installer_template.nsi
View File

@@ -409,12 +409,6 @@ Section "Viewer"
;This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
%%INSTALL_FILES%%
!ifdef WIN64_BIN_BUILD
ExecWait '"$INSTDIR\redist\vc_redist.x64.exe" /passive /norestart'
!else
ExecWait '"$INSTDIR\redist\vc_redist.x86.exe" /passive /norestart'
!endif
;Pass the installer's language to the client to use as a default
StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"