Merge branch 'master' into jwi-cmakelanguagestandard

Author: jwillemsen

templates/bmake.mpd

@@ -13,6 +13,7 @@ OPTIMIZE_CFLAGS = <%optimize_flags%>
 DEBUG_CFLAGS = <%debug_flags%>
 RELEASE_CFLAGS = <%release_flags%>
 CC_CFLAGS = <%ccflags%>
+STACK_LFLAG = <%stack_flag%>
 WARN_FLAGS = <%warn_flags%>
 BINARY_FLAGS = <%binary_flags%>
 THREAD_FLAGS = <%thr_flags%>
@@ -136,7 +137,7 @@ LFLAGS   = \
         <%linkflags%> \
 <%endif%>
 <%if(StackReserveSize)%>
-           /S:<%StackReserveSize%> \
+           $(STACK_LFLAG)<%StackReserveSize%> \
 <%endif%>
 <%if(StackCommitSize)%>
            /Sc:<%StackCommitSize%> \

templates/bmakecommon.mpt

@@ -19,6 +19,7 @@ debug_flags = -v -y -Od -vi- -k
 release_flags =
 optimize_flags = -O1
 warn_flags = -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-mls
+stack_flag = /S:
 cc = bcc32
 thr_flags = -tWM
 binary_flags = -tWR -tWD
@@ -45,6 +46,7 @@ debug_flags = -Od -vi-
 release_flags =
 optimize_flags = -O3
 warn_flags =
+stack_flag = /S:
 cc = bcc32c
 binary_flags = -tR -tD
 thr_flags = -tM
@@ -70,6 +72,7 @@ debug_flags = -g -O0
 release_flags =
 optimize_flags = -O3
 warn_flags =
+stack_flag = /S:
 cc = bcc64
 binary_flags = -tR -tD
 thr_flags = -tM
@@ -95,6 +98,7 @@ debug_flags = -g -O0
 release_flags = -Wno-ignored-attributes
 optimize_flags = -O3
 warn_flags =
+stack_flag = --stack=
 cc = bcc64x
 binary_flags = -tR -tD
 thr_flags = -tM