diff options
| author | RJ Ryan <rryan@mixxx.org> | 2014-09-16 13:56:42 -0400 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2014-09-16 13:56:42 -0400 |
| commit | 1f35632a7d4b80475f92dfe15f19634fe0555efe (patch) | |
| tree | 3ab212c3ce5063d5f25e7fa46591333101722bc5 /build/nsis | |
| parent | aa4557c422164890ac17fe26e55681bfae0b5f0c (diff) | |
Update MSVC++ runtime installation.
* Distribute the runtime executable installer instead of an MSI.
* Remove hacky util.get_mssdk_path() since it essentially picks an SDK at random if you have multiple installed.
* Update NSIS to use MSVC2013 runtime registry key.
Diffstat (limited to 'build/nsis')
| -rw-r--r-- | build/nsis/Mixxx.nsi | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/build/nsis/Mixxx.nsi b/build/nsis/Mixxx.nsi index 1cee93b2b1..d32543c205 100644 --- a/build/nsis/Mixxx.nsi +++ b/build/nsis/Mixxx.nsi @@ -121,17 +121,12 @@ Function InstallVCRedist SetOutPath $TEMP ; Put the VC redist installer files there - File ${WINLIB_PATH}\VC_redist\vc_red.cab - File ${WINLIB_PATH}\VC_redist\vc_red.msi - File ${WINLIB_PATH}\VC_redist\msp_kb2565063.msp + File ${WINLIB_PATH}\vcredist_${ARCH}.exe ClearErrors ; Call it & wait for it to install - ExecWait 'msiexec /i $TEMP\vc_red.msi' - ExecWait 'msiexec /update $TEMP\msp_kb2565063.msp' - Delete "$TEMP\vc_red.cab" - Delete "$TEMP\vc_red.msi" - Delete "$TEMP\msp_kb2565063.msp" + ExecWait 'vcredist_${ARCH}.exe /quiet /install' + Delete "$TEMP\vc_redist_${ARCH}.exe" IfErrors 0 VCRedistDone MessageBox MB_ICONSTOP|MB_OK "There was a problem installing the Microsoft Visual C++ libraries.$\r$\nYou may need to run this installer as an administrator." Abort @@ -172,7 +167,7 @@ FunctionEnd Function CheckVCRedist Push $R0 ClearErrors - ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\${ARCH}" "Installed" + ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\VC\Runtimes\${ARCH}" "Installed" ; Old way: ; x64 ;ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DA5E371C-6333-3D8A-93A4-6FD5B20BCC6E}" "Version" |