diff options
| author | rubidium <rubidium@openttd.org> | 2013-11-17 16:16:55 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2013-11-17 16:16:55 +0000 |
| commit | 8abbcd3700dd69e59cc7d3bf50ca520c74c6bda3 (patch) | |
| tree | 407b778336949156f8cafb5f7908a00050980436 /os/windows | |
| parent | ec4806a82dd36ea81ba3b4351478016eac10745b (diff) | |
| download | openttd-8abbcd3700dd69e59cc7d3bf50ca520c74c6bda3.tar.xz | |
(svn r26028) -Fix [FS#5773]: make the installer warning about Windows XP SP3 not trigger on the 64 bit Windows XP which isn't really Windows XP to start with
Diffstat (limited to 'os/windows')
| -rw-r--r-- | os/windows/installer/install.nsi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index c2045788e..cdde70a63 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -545,15 +545,22 @@ FunctionEnd ;------------------------------------------------------------------------------- ; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack Function GetWindowsVersion + GetVersion::WindowsPlatformArchitecture + Pop $R0 + IntCmp $R0 64 WinNT 0 ClearErrors StrCpy $R0 "win9x" ${If} ${IsNT} ${If} ${IsWinXP} ${AndIf} ${AtLeastServicePack} 3 ${OrIf} ${AtLeastWin2003} - StrCpy $R0 "winnt" + GoTo WinNT ${EndIf} ${EndIf} + GoTo Done +WinNT: + StrCpy $R0 "winnt" +Done: Push $R0 FunctionEnd |