Author: mladen.turk(a)jboss.com Date: 2008-04-02 08:31:16 -0400 (Wed, 02 Apr 2008) New Revision: 1495 Modified: trunk/utils/windows/native/service/procrun/NMAKEcommon.inc trunk/utils/windows/native/service/procrun/NMAKEsvc Log: Use proper stack size Modified: trunk/utils/windows/native/service/procrun/NMAKEcommon.inc =================================================================== --- trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-04-02 12:19:00 UTC (rev 1494) +++ trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-04-02 12:31:16 UTC (rev 1495) @@ -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 @@ -193,6 +205,9 @@ # 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 Modified: trunk/utils/windows/native/service/procrun/NMAKEsvc =================================================================== --- trunk/utils/windows/native/service/procrun/NMAKEsvc 2008-04-02 12:19:00 UTC (rev 1494) +++ trunk/utils/windows/native/service/procrun/NMAKEsvc 2008-04-02 12:31:16 UTC (rev 1495) @@ -29,6 +29,10 @@ SRCDIR = . !ENDIF +!IF "$(CPU)" == "X86" +LFLAGS = $(LFLAGS) /stack:0x50000 +!ENDIF + LFLAGS = $(LFLAGS) user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib shlwapi.lib netapi32.lib INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\src -I$(SRCDIR)\apps\prunsrv -I$(JAVA_HOME)\include -I$(JAVA_HOME)\include\win32