Skip to content

Commit

Permalink
Revert "Update NSIS and WiX scripts to look for MSVC 2015 runtimes."
Browse files Browse the repository at this point in the history
AppVeyor builds still use MSVC 2013. (but won't after PR #1131).

This reverts commit b2b720f.
  • Loading branch information
rryan committed Jan 18, 2017
1 parent 5f1a20c commit e1b3a42
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/nsis/Mixxx.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ FunctionEnd
Function CheckVCRedist
Push $R0
ClearErrors
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\${ARCH}" "Installed"
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\VC\Runtimes\${ARCH}" "Installed"

IfErrors 0 VSRedistInstalled
StrCpy $R0 "-1"
Expand Down
2 changes: 1 addition & 1 deletion build/wix/mixxx.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<Property Id="VCREDISTINSTALLED">
<RegistrySearch Id="VCRedistInstalledSearch"
Root="HKLM"
Key="SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.Platform)"
Key="SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\VC\Runtimes\$(var.Platform)"
Name="Installed"
Type="raw" />
</Property>
Expand Down

0 comments on commit e1b3a42

Please sign in to comment.