← Back to branch summary

~neale/mixxx/m4a

« back to all changes in this revision

Viewing changes to mixxx/build/nsis/Mixxx.nsi

  • Committer: RJ Ryan
  • Date: 2012-07-20 00:31:58 UTC
  • mfrom: (3283.1.38 1.11)
  • Revision ID: rryan@mit.edu-20120720003158-9fhwnbd43xyg1woo
Merging from lp:mixxx/1.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/build/nsis/Mixxx.nsi
123
123
  ; Put the VC redist installer files there
124
124
  File ${WINLIB_PATH}\VC_redist\vc_red.cab
125
125
  File ${WINLIB_PATH}\VC_redist\vc_red.msi
 
126
  File ${WINLIB_PATH}\VC_redist\msp_kb2565063.msp
126
127
 
127
128
  ClearErrors
128
129
  ; Call it & wait for it to install
129
130
  ExecWait 'msiexec /i $TEMP\vc_red.msi'
 
131
  ExecWait 'msiexec /update $TEMP\msp_kb2565063.msp'
130
132
  Delete "$TEMP\vc_red.cab"
131
133
  Delete "$TEMP\vc_red.msi"
 
134
  Delete "$TEMP\msp_kb2565063.msp"
132
135
  IfErrors 0 VCRedistDone
133
136
  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."
134
137
  Abort