Author: mladen.turk(a)jboss.com Date: 2008-03-16 17:27:02 -0400 (Sun, 16 Mar 2008) New Revision: 1443 Modified: trunk/httpd/httpd-2.2/NMAKEcommon.inc Log: Merge from main .inc file Modified: trunk/httpd/httpd-2.2/NMAKEcommon.inc =================================================================== --- trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-16 21:26:22 UTC (rev 1442) +++ trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-16 21:27:02 UTC (rev 1443) @@ -67,30 +67,34 @@ RC = rc.exe !ENDIF +!IF !DEFINED(MT) || "$(MT)" == "" +MT = mt.exe +!ENDIF + # Read the PROCESSOR_ARCHITECTURE environment value for a CPU type -!IF "$(BUILDCPU)" == "i386" || "$(BUILDCPU)" == "x86" || "$(BUILDCPU)" == "i686" -CPU=I386 +!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" == "i686" +CPU=X86 !ENDIF -!IF "$(BUILDCPU)" == "amd64" || "$(BUILDCPU)" == "x86_64" -CPU=AMD64 +!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64" +CPU=X64 !ENDIF -!IF "$(BUILDCPU)" == "ia64" +!IF "$(BUILD_CPU)" == "ia64" CPU=IA64 !ENDIF !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 @@ -180,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 @@ -224,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 @@ -292,17 +296,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"