Merge branch 'master' into jwi-exeextbmake

templates/bmake.mpd

@@ -11,6 +11,7 @@
 CC = <%cc%>
 OPTIMIZE_CFLAGS = <%optimize_flags%>
 DEBUG_CFLAGS = <%debug_flags%>
+RELEASE_CFLAGS = <%release_flags%>
 CC_CFLAGS = <%ccflags%>
 WARN_FLAGS = <%warn_flags%>
 BINARY_FLAGS = <%binary_flags%>
@@ -46,7 +47,7 @@ LINKER_EXE_ARGUMENTS = <%linker_exe_arguments%>
 
 <%foreach(configurations)%>
 !ifdef <%normalize(uc(configuration))%>
-OCFLAGS    = <%if(optimize)%>$(OPTIMIZE_CFLAGS)<%else%><%if(debug_prj)%> $(DEBUG_CFLAGS)<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
+OCFLAGS    = <%if(optimize)%>$(OPTIMIZE_CFLAGS)<%else%><%if(debug_prj)%> $(DEBUG_CFLAGS)<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%><%if(!debug_prj)%> $(RELEASE_CFLAGS)<%endif%>
 CFG_DIR      = <%intermediate_dir%>\\
 LIBMODIFIER  = <%if(use_lib_modifier)%><%lib_modifier%><%endif%>
 EXEMODIFIER  = <%if(use_exe_modifier)%><%lib_modifier%><%endif%>

templates/bmakecommon.mpt

@@ -16,6 +16,7 @@ libflags = /C
 
 bcc32  {
 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
 cc = bcc32
@@ -41,6 +42,7 @@ linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPU
 
 bcc32c {
 debug_flags = -Od -vi-
+release_flags =
 optimize_flags = -O3
 warn_flags =
 cc = bcc32c
@@ -65,6 +67,7 @@ linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPU
 
 bcc64 {
 debug_flags = -g -O0
+release_flags =
 optimize_flags = -O3
 warn_flags =
 cc = bcc64
@@ -89,6 +92,7 @@ linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPU
 
 bcc64x {
 debug_flags = -g -O0
+release_flags = -Wno-ignored-attributes
 optimize_flags = -O3
 warn_flags =
 cc = bcc64x