4:21 p.m.
Author: mladen.turk(a)jboss.com
Date: 2008-03-16 17:21:40 -0400 (Sun, 16 Mar 2008)
New Revision: 1441
Modified:
trunk/build/NMAKEcommon.inc
trunk/build/unix/build.sh
trunk/build/windows/build.bat
Log:
Use x86, x64 instead i686 and amd64. Amd64 is EMT64 so usable on Intel cpu's as well
Modified: trunk/build/NMAKEcommon.inc
===================================================================
--- trunk/build/NMAKEcommon.inc 2008-03-16 21:00:11 UTC (rev 1440)
+++ trunk/build/NMAKEcommon.inc 2008-03-16 21:21:40 UTC (rev 1441)
@@ -74,10 +74,10 @@
# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type
!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" ==
"x86" || "$(BUILD_CPU)" == "i686"
-CPU=I386
+CPU=X86
!ENDIF
-!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" ==
"x86_64"
-CPU=AMD64
+!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" ==
"x86_64" || "$(BUILD_CPU)" == "x64"
+CPU=X64
!ENDIF
!IF "$(BUILD_CPU)" == "ia64"
CPU=IA64
@@ -85,16 +85,16 @@
!IF !DEFINED(CPU) || "$(CPU)" == ""
!IF "$(PROCESSOR_ARCHITECTURE)" == ""
-CPU=I386
+CPU=X86
!ELSE
CPU=$(PROCESSOR_ARCHITECTURE)
!ENDIF
!ENDIF
-!IF "$(CPU)" != "I386"
-!IF "$(CPU)" != "AMD64"
+!IF "$(CPU)" != "X86"
+!IF "$(CPU)" != "X64"
!IF "$(CPU)" != "IA64"
-!ERROR Must specify CPU environment variable (I386, AMD64, IA64) $(CPU)
+!ERROR Must specify CPU environment variable (X86, X64, IA64) $(CPU)
!ENDIF
!ENDIF
!ENDIF
@@ -184,22 +184,22 @@
# Common flags for all platforms
CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3
-!IF "$(CPU)" == "I386"
+!IF "$(CPU)" == "X86"
CPU_CFLAGS = -D_X86_=1
-!ELSEIF "$(CPU)" == "AMD64"
+!ELSEIF "$(CPU)" == "X64"
CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64
!ELSEIF "$(CPU)" == "IA64"
CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64
!ENDIF
!IF "$(INCLUDE_PRE64PRA)" == "1"
-!IF "$(CPU)" != "I386"
+!IF "$(CPU)" != "X86"
CPU_CFLAGS = $(CPU_CFLAGS) /FIPRE64PRA.H
!ENDIF
!ENDIF
!IF "$(BUILD)" == "RELEASE"
-!IF "$(CPU)" == "I386"
+!IF "$(CPU)" == "X86"
OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
!ELSE
OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG
@@ -228,7 +228,7 @@
# Linker section
LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
$(LIBS)
!IF "$(INCLUDE_BUFFEROVERFLOWU)" == "1"
-!IF "$(CPU)" != "I386"
+!IF "$(CPU)" != "X86"
LIBS = $(LIBS) bufferoverflowu.lib
!ENDIF
!ENDIF
@@ -293,17 +293,17 @@
!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != ""
JAVA_INCLUDES=-I "$(JAVA_HOME)\include"
-!IF "$(CPU)" != "I386"
+!IF "$(CPU)" != "X86"
JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win64"
!ENDIF
JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win32"
!ENDIF
!IF !DEFINED(ML) || "$(ML)" == ""
-!IF "$(CPU)" == "I386"
+!IF "$(CPU)" == "X86"
ML = ml.exe
AFLAGS = /coff /Zi /c
-!ELSEIF "$(CPU)" == "AMD64"
+!ELSEIF "$(CPU)" == "X64"
ML = ml64.exe
AFLAGS = /Zi /c
!ELSEIF "$(CPU)" == "IA64"
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-16 21:00:11 UTC (rev 1440)
+++ trunk/build/unix/build.sh 2008-03-16 21:21:40 UTC (rev 1441)
@@ -255,10 +255,10 @@
BUILD_CPU=sparcv9
;;
i86pc*)
- BUILD_CPU=i686
+ BUILD_CPU=x86
;;
x86_64*)
- BUILD_CPU=amd64
+ BUILD_CPU=x64
;;
9000/800*)
BUILD_CPU=parisc2
@@ -577,7 +577,7 @@
solaris-sparcv9)
./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags}
solaris-sparcv9-cc || exit 1
;;
- solaris-i686)
+ solaris-x86)
./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} solaris-x86-cc
|| exit 1
;;
hpux-parisc2)
@@ -589,11 +589,11 @@
linux2-ppc64)
./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} linux-ppc64 ||
exit 1
;;
- windows-i686)
+ windows-x86)
./Configure ${ssl_target} VC-NT
ms/do_masm.bat
;;
- windows-amd64)
+ windows-x64)
./Configure ${ssl_target} VC-WIN64A
ms/do_win64a.bat
;;
Modified: trunk/build/windows/build.bat
===================================================================
--- trunk/build/windows/build.bat 2008-03-16 21:00:11 UTC (rev 1440)
+++ trunk/build/windows/build.bat 2008-03-16 21:21:40 UTC (rev 1441)
@@ -103,9 +103,11 @@
set BUILD_CPU=%1
shift
@if /i "%BUILD_CPU%" == "i686" goto cpuX86
-@if /i "%BUILD_CPU%" == "amd64" goto cpuAMD64
+@if /i "%BUILD_CPU%" == "x86" goto cpuX86
+@if /i "%BUILD_CPU%" == "amd64" goto cpuX64
+@if /i "%BUILD_CPU%" == "x64" goto cpuX86
@if /i "%BUILD_CPU%" == "ia64" goto cpuIA64
-echo Usage: %PROGNAME% CPU where CPU is i686 amd64 or ia64
+echo Usage: %PROGNAME% CPU where CPU is x86 x64 or ia64
echo or : %PROGNAME% sdk CPU if you are cross compiling
goto cmdEnd
@@ -118,7 +120,7 @@
)
goto cmdBuild
-:cpuAMD64
+:cpuX64
@if "%USE_PLATFORM_SDK%" == "1" (
call "%MSWPSDK%\SetEnv" /X64 /RETAIL
) else (