Author: mladen.turk(a)jboss.com Date: 2008-03-29 03:22:58 -0400 (Sat, 29 Mar 2008) New Revision: 1483 Modified: trunk/httpd/httpd-2.2/NMAKEcommon.inc Log: Copy main .inc file. TODO: Use the master .inc file Modified: trunk/httpd/httpd-2.2/NMAKEcommon.inc =================================================================== --- trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-29 07:14:23 UTC (rev 1482) +++ trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-29 07:22:58 UTC (rev 1483) @@ -20,12 +20,12 @@ # and linker parameters. # Common params: # CPU Compile for specified CPU. Supported CPU's are: -# i386 -# AMD64 -# IA64 +# X86 (Common x86 architecture) +# X64 (AMD64/EMT64 architecture) +# I64 (Intel IA64 architecture) # If not specified it will default to the # PROCESSOR_ARCHITECTURE environment variable -# or to the i386 if not specified. +# or to the X86 if not specified. # WINVER Compile for specified Windows version # WINNT for Windows 2000 and up(default) # WINXP for Windows XP and up @@ -50,6 +50,13 @@ # LFLAGS Added to the common LFLAGS # RCFLAGS Added to the common RCFLAGS # +# Compiler tools environment variables: +# CC C compiler (defaults to cl.exe) +# LINK Linker (defaults to link.exe) +# RC Resource compiler (defaults to rc.exe) +# MT Manifest toolkit (defaults to mt.exe) +# ML Assembler (defaults to ml.exe or ml64.exe) +# # Originally contributed by Mladen Turk <mturk jboss.com> # # ==================================================================== @@ -85,12 +92,17 @@ !IF !DEFINED(CPU) || "$(CPU)" == "" !IF "$(PROCESSOR_ARCHITECTURE)" == "" +!IF "$(PROCESSOR_ARCHITEW6432)" == "" CPU=X86 !ELSE +CPU=$(PROCESSOR_ARCHITEW6432) +!ENDIF +!ELSE CPU=$(PROCESSOR_ARCHITECTURE) !ENDIF !ENDIF + !IF "$(CPU)" == "I386" CPU=X86 !ENDIF