diff options
| author | rubidium <rubidium@openttd.org> | 2008-08-15 23:00:56 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-08-15 23:00:56 +0000 |
| commit | a8e85f00c9580b06934002a7fdfdc0f706d6ac9b (patch) | |
| tree | 486cb418c7d7d2f9986ebfea47df3e982accc9b5 /os/win32/installer/install.nsi | |
| parent | c10691faffc9d08b6342b18c3be6f27e659fb43e (diff) | |
| download | openttd-a8e85f00c9580b06934002a7fdfdc0f706d6ac9b.tar.xz | |
(svn r14081) -Fix (r14075): WoW64 spoiled the 64 bits Windows detection and the installer for the 64 bits binary installed in the wrong directory. Thanks to michi_cc and glx for testing.
Diffstat (limited to 'os/win32/installer/install.nsi')
| -rw-r--r-- | os/win32/installer/install.nsi | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index b16a988fc..7e7f20519 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -31,7 +31,6 @@ VIAddVersionKey "LegalCopyright" " " Name "${APPNAMEANDVERSION} ${APPBITS} bits version ${EXTRA_VERSION}" ; NOTE: Keep trailing backslash! -InstallDir "$PROGRAMFILES\OpenTTD\" InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder" OutFile "openttd-${APPVERSION}-${APPARCH}.exe" CRCCheck force @@ -395,8 +394,9 @@ Function GetWindowsVersion ClearErrors StrCpy $R0 "winnt" - ReadRegStr $R1 HKLM "SOFTWARE\MICROSOFT\WINDOWS NT\CurrentVersion" CurrentVersion - IfErrors 0 WinNT + GetVersion::WindowsPlatformId + Pop $R0 + IntCmp $R0 2 WinNT 0 StrCpy $R0 "win9x" WinNT: ClearErrors @@ -406,10 +406,9 @@ FunctionEnd ;------------------------------------------------------------------------------- ; Check whether we're not running an installer for 64 bits on 32 bits and vice versa Function CheckProcessorArchitecture - cpudesc::tell - Pop $0 ;full identification string in $0 - StrCpy $1 $0 2, 56 ;pull out the architecture - StrCmp $1 "00" 0 Win64 + GetVersion::WindowsPlatformArchitecture + Pop $R0 + IntCmp $R0 64 Win64 0 ClearErrors IntCmp ${APPBITS} 64 0 Done MessageBox MB_OKCANCEL|MB_ICONSTOP "You want to install the 64 bits OpenTTD on a 32 bits Operating System. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort |