diff options
Diffstat (limited to 'indra/newview/installers/windows')
| -rwxr-xr-x | indra/newview/installers/windows/installer_template.nsi | 44 | 
1 files changed, 22 insertions, 22 deletions
| diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 77a23ac26c..85fa160bb9 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -116,7 +116,7 @@ Var DO_UNINSTALL_V2     ; If non-null, path to a previous Viewer 2 installation  !include "FileFunc.nsh"     ; For GetParameters, GetOptions
  !insertmacro GetParameters
  !insertmacro GetOptions
 -!include WinVer.nsh			; For OS and SP detection +!include WinVer.nsh			; For OS and SP detection
  !include x64.nsh			; For 64bit OS detection
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 @@ -155,33 +155,33 @@ Function dirPre  FunctionEnd    
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 -; Make sure this computer meets the minimum system requirements. -; Currently: Windows 32bit XP SP3, 64bit XP SP2 and Server 2003 SP2 -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function CheckWindowsVersion +; Make sure this computer meets the minimum system requirements.
 +; Currently: Windows 32bit XP SP3, 64bit XP SP2 and Server 2003 SP2
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +Function CheckWindowsVersion
    ${If} ${AtMostWin2000}
 -    MessageBox MB_OK $(CheckWindowsVersionMB) +    MessageBox MB_OK $(CheckWindowsVersionMB)
      Quit
 -  ${EndIf} - -  ${If} ${IsWinXP} -  ${AndIfNot} ${RunningX64} +  ${EndIf}
 +
 +  ${If} ${IsWinXP}
 +  ${AndIfNot} ${RunningX64}
    ${AndIfNot} ${IsServicePack} 3
 -    MessageBox MB_OK $(CheckWindowsVersionMB) +    MessageBox MB_OK $(CheckWindowsVersionMB)
      Quit
 -  ${EndIf} - -  ${If} ${IsWinXP} -  ${AndIf} ${RunningX64} +  ${EndIf}
 +
 +  ${If} ${IsWinXP}
 +  ${AndIf} ${RunningX64}
 +  ${AndIfNot} ${IsServicePack} 2
 +    MessageBox MB_OK $(CheckWindowsVersionMB)
 +    Quit
 +  ${EndIf}
 +
 +  ${If} ${IsWin2003}
    ${AndIfNot} ${IsServicePack} 2
 -    MessageBox MB_OK $(CheckWindowsVersionMB) +    MessageBox MB_OK $(CheckWindowsVersionMB)
      Quit
 -  ${EndIf} - -  ${If} ${IsWin2003} -  ${AndIfNot} ${IsServicePack} 2 -    MessageBox MB_OK $(CheckWindowsVersionMB) -    Quit    ${EndIf}
  FunctionEnd
 | 
