Author: mladen.turk(a)jboss.com Date: 2008-04-02 08:58:56 -0400 (Wed, 02 Apr 2008) New Revision: 1500 Modified: trunk/build/NMAKEcommon.inc trunk/httpd/httpd-2.2/NMAKEcommon.inc trunk/utils/windows/native/service/procrun/NMAKEcommon.inc Log: Use correct /MACHINE linker flag Modified: trunk/build/NMAKEcommon.inc =================================================================== --- trunk/build/NMAKEcommon.inc 2008-04-02 12:44:26 UTC (rev 1499) +++ trunk/build/NMAKEcommon.inc 2008-04-02 12:58:56 UTC (rev 1500) @@ -211,10 +211,13 @@ !IF "$(CPU)" == "X86" CPU_CFLAGS = -D_X86_=1 +MACHINE=X86 !ELSEIF "$(CPU)" == "X64" CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 +MACHINE=AMD64 !ELSEIF "$(CPU)" == "I64" CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 +MACHINE=IA64 !ENDIF !IF "$(INCLUDE_PRE64PRA)" == "1" @@ -271,11 +274,11 @@ !ENDIF !IF "$(TARGET)" == "EXE" -LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "GUI" -LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "DLL" -LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "LIB" LFLAGS = -lib $(COMMON_LFLAGS) !ENDIF Modified: trunk/httpd/httpd-2.2/NMAKEcommon.inc =================================================================== --- trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-04-02 12:44:26 UTC (rev 1499) +++ trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-04-02 12:58:56 UTC (rev 1500) @@ -205,13 +205,19 @@ # Common flags for all platforms CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3 +!IF "$(TARGET)" == "EXE" +CMN_CFLAGS = $(CMN_CFLAGS) -D_CONSOLE +!ENDIF !IF "$(CPU)" == "X86" CPU_CFLAGS = -D_X86_=1 +MACHINE=X86 !ELSEIF "$(CPU)" == "X64" CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 +MACHINE=AMD64 !ELSEIF "$(CPU)" == "I64" CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 +MACHINE=IA64 !ENDIF !IF "$(INCLUDE_PRE64PRA)" == "1" @@ -268,11 +274,11 @@ !ENDIF !IF "$(TARGET)" == "EXE" -LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "GUI" -LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "DLL" -LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "LIB" LFLAGS = -lib $(COMMON_LFLAGS) !ENDIF Modified: trunk/utils/windows/native/service/procrun/NMAKEcommon.inc =================================================================== --- trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-04-02 12:44:26 UTC (rev 1499) +++ trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-04-02 12:58:56 UTC (rev 1500) @@ -211,10 +211,13 @@ !IF "$(CPU)" == "X86" CPU_CFLAGS = -D_X86_=1 +MACHINE=X86 !ELSEIF "$(CPU)" == "X64" CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 +MACHINE=AMD64 !ELSEIF "$(CPU)" == "I64" CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 +MACHINE=IA64 !ENDIF !IF "$(INCLUDE_PRE64PRA)" == "1" @@ -271,11 +274,11 @@ !ENDIF !IF "$(TARGET)" == "EXE" -LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "GUI" -LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "DLL" -LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE) !ELSEIF "$(TARGET)" == "LIB" LFLAGS = -lib $(COMMON_LFLAGS) !ENDIF