From a4d001bb583f533e01402f42adf04619d1f09fa7 Mon Sep 17 00:00:00 2001 From: mturk Date: Tue, 23 Jun 2009 09:47:13 +0000 Subject: [PATCH] Use correct CPU names git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@787608 13f79535-47bb-0310-9956-ffa450edef68 --- res/tomcat.nsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 3563f9a0d..830f80f49 100644 --- 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" -- 2.11.0