Use correct CPU names

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@787608 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 3563f9a..830f80f 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -228,9 +228,9 @@ Section "Native" SecTomcatNative
 
   StrCmp $0 "x86" 0 +2
   File bin\tcnative-1.dll
-  StrCmp $0 "x86_64" 0 +2
+  StrCmp $0 "x64" 0 +2
   File /oname=tcnative-1.dll bin\x64\tcnative-1.dll
-  StrCmp $0 "ia64" 0 +2
+  StrCmp $0 "i64" 0 +2
   File /oname=tcnative-1.dll bin\i64\tcnative-1.dll
 
   ClearErrors
@@ -377,7 +377,7 @@ Function FindCpuType
   StrCpy $1 "x86"
   ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
   StrCmp $0 "%PROCESSOR_ARCHITEW6432%" 0 +5
-  StrCmp $0 "IA64" 0 +3        
+  StrCmp $0 "IA64" 0 +3
   StrCpy $1 "i64"
   Goto FoundCpu
   StrCpy $1 "x64"