ChangeLogTag: Mon Aug 25 11:13:28 2003 Chad Elliott <elliott_c@ociweb.com>

18 files changed, 122 insertions, 73 deletions

diff --git a/templates/em3.mpd b/templates/em3.mpd
index 23f3a4f5..987b1961 100644
--- a/templates/em3.mpd
+++ b/templates/em3.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
index 23f3a4f5..987b1961 100644
--- a/templates/em3vcp.mpd
+++ b/templates/em3vcp.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
diff --git a/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt
index 9b9d0a93..1387710e 100644
--- a/templates/em3vcpdll.mpt
+++ b/templates/em3vcpdll.mpt
@@ -38,7 +38,8 @@ WCE ARM {
 
 Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Release
@@ -47,7 +48,8 @@ Release {
 
 Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = .
@@ -57,7 +59,8 @@ Debug {
 
 MFC Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
@@ -68,7 +71,8 @@ MFC Release {
 
 MFC Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
diff --git a/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt
index c8c66109..08f7a5a0 100644
--- a/templates/em3vcpdllexe.mpt
+++ b/templates/em3vcpdllexe.mpt
@@ -38,7 +38,8 @@ WCE ARM {
 
 Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Release
@@ -47,7 +48,8 @@ Release {
 
 Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG
   compile_flags_removed = /YX
   output_dir            = .
@@ -57,7 +59,8 @@ Debug {
 
 MFC Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Release
@@ -68,7 +71,8 @@ MFC Release {
 
 MFC Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Debug
diff --git a/templates/em3vcplib.mpt b/templates/em3vcplib.mpt
index 43d63578..3776ae06 100644
--- a/templates/em3vcplib.mpt
+++ b/templates/em3vcplib.mpt
@@ -38,7 +38,8 @@ WCE ARM {
 
 Static Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Static_Release
@@ -48,7 +49,8 @@ Static Release {
 
 Static Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = Static_Debug
@@ -59,7 +61,8 @@ Static Debug {
 
 MFC Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
@@ -70,7 +73,8 @@ MFC Release {
 
 MFC Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
diff --git a/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt
index e297cd11..bfeb2267 100644
--- a/templates/em3vcplibexe.mpt
+++ b/templates/em3vcplibexe.mpt
@@ -39,7 +39,8 @@ WCE ARM {
 
 Static Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG
   compile_flags_removed = /YX
   lib_modifier          = s
@@ -49,7 +50,8 @@ Static Release {
 
 Static Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG
   compile_flags_removed = /YX
   lib_modifier          = sd
@@ -59,7 +61,8 @@ Static Debug {
 
 MFC Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /O2 /Zi
+  optimize              = 1
+  compile_flags         = /W3 /Zi
   defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcs
@@ -70,7 +73,8 @@ MFC Release {
 
 MFC Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Zi /Od
+  optimize              =
+  compile_flags         = /W3 /Zi
   defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcsd
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 9f2acfa0..084b9cf9 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -110,7 +110,7 @@ REALCLEAN : CLEAN
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
+CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -199,7 +199,7 @@ SOURCE=.\<%pch_source%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
-CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
+CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
 
 "$(INTDIR)\<%basenoextension(pch_source)%>.obj"	"$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
diff --git a/templates/nmakedll.mpt b/templates/nmakedll.mpt
index 57b2e3cf..74ec8734 100644
--- a/templates/nmakedll.mpt
+++ b/templates/nmakedll.mpt
@@ -21,7 +21,8 @@ Win64 {
 Release {
   type_code             = 0x0102
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Release
@@ -35,7 +36,8 @@ Release {
 Debug {
   type_code             = 0x0102
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = .
@@ -50,7 +52,8 @@ Static Release {
   type_description      = "Static Library"
   type_code             = 0x0104
   use_debug_libraries   = 0
-  compile_flags         = /G5 /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Static_Release
@@ -65,7 +68,8 @@ Static Debug {
   type_description      = "Static Library"
   type_code             = 0x0104
   use_debug_libraries   = 1
-  compile_flags         = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /GR /Gy /MDd
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = Static_Debug
@@ -78,7 +82,8 @@ Static Debug {
 MFC Release {
   type_code             = 0x0102
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
@@ -93,7 +98,8 @@ MFC Release {
 MFC Debug {
   type_code             = 0x0102
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
@@ -108,7 +114,8 @@ Static MFC Release {
   type_description      = "Static Library"
   type_code             = 0x0104
   use_debug_libraries   = 0
-  compile_flags         = /G5 /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Static_MFC_Release
@@ -123,7 +130,8 @@ Static MFC Debug {
   type_description      = "Static Library"
   type_code             = 0x0104
   use_debug_libraries   = 1
-  compile_flags         = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /GR /Gy /MDd
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = Static_MFC_Debug
diff --git a/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index 24df5c8e..060431e4 100644
--- a/templates/nmakeexe.mpt
+++ b/templates/nmakeexe.mpt
@@ -25,7 +25,8 @@ Win64 {
 
 Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Release
@@ -35,7 +36,8 @@ Release {
 
 Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /YX
   output_dir            = .
@@ -45,7 +47,8 @@ Debug {
 
 Static Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   lib_modifier          = s
@@ -57,7 +60,8 @@ Static Release {
 
 Static Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /YX
   lib_modifier          = sd
@@ -69,7 +73,8 @@ Static Debug {
 MFC Release {
   subsystem             = windows
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Release
@@ -81,7 +86,8 @@ MFC Release {
 MFC Debug {
   subsystem             = windows
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Debug
@@ -92,7 +98,8 @@ MFC Debug {
 Static MFC Release {
   subsystem             = windows
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcs
@@ -105,7 +112,8 @@ Static MFC Release {
 Static MFC Debug {
   subsystem             = windows
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcsd
diff --git a/templates/vc6.mpd b/templates/vc6.mpd
index 2dbb7802..703e1ba3 100644
--- a/templates/vc6.mpd
+++ b/templates/vc6.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
index 2dbb7802..703e1ba3 100644
--- a/templates/vc6dsp.mpd
+++ b/templates/vc6dsp.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
diff --git a/templates/vc6dspdll.mpt b/templates/vc6dspdll.mpt
index e432257a..7ad8406b 100644
--- a/templates/vc6dspdll.mpt
+++ b/templates/vc6dspdll.mpt
@@ -9,7 +9,8 @@ pdb             = 1
 
 Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Release
@@ -19,7 +20,8 @@ Release {
 
 Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   intermediate_dir      = Debug
@@ -28,7 +30,8 @@ Debug {
 
 MFC Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
@@ -40,7 +43,8 @@ MFC Release {
 
 MFC Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
diff --git a/templates/vc6dspdllexe.mpt b/templates/vc6dspdllexe.mpt
index c90e398b..1496559c 100644
--- a/templates/vc6dspdllexe.mpt
+++ b/templates/vc6dspdllexe.mpt
@@ -11,7 +11,8 @@ pdb              = 1
 
 Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Release
@@ -21,7 +22,8 @@ Release {
 
 Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /YX
   intermediate_dir      = Debug
@@ -32,7 +34,8 @@ Debug {
 MFC Release {
   subsystem             = windows
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   common_defines        = WIN32 _WINDOWS
   defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
@@ -46,7 +49,8 @@ MFC Release {
 MFC Debug {
   subsystem             = windows
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   common_defines        = WIN32 _WINDOWS
   defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
diff --git a/templates/vc6dsplib.mpt b/templates/vc6dsplib.mpt
index 0dd5f276..0dc477c6 100644
--- a/templates/vc6dsplib.mpt
+++ b/templates/vc6dsplib.mpt
@@ -4,15 +4,15 @@ conditional_include "common"
 type_description      = "Static Library"
 type_code             = 0x0104
 configurations        = Release Debug
-default_configuration = Debug
-common_defines        = WIN32 _WINDOWS
 type_is_static        = 1
-need_staticflags         = 1
+need_staticflags      = 1
+common_defines        = WIN32 _WINDOWS
 
 
 Release {
   use_debug_libraries   = 0
-  compile_flags         = /G5 /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Release
@@ -23,7 +23,8 @@ Release {
 
 Debug {
   use_debug_libraries   = 1
-  compile_flags         = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = Debug
@@ -34,7 +35,8 @@ Debug {
 
 MFC Release {
   use_debug_libraries   = 0
-  compile_flags         = /G5 /W3 /GX /O2 /MD /Zi /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
@@ -46,7 +48,8 @@ MFC Release {
 
 MFC Debug {
   use_debug_libraries   = 1
-  compile_flags         = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
diff --git a/templates/vc6dsplibexe.mpt b/templates/vc6dsplibexe.mpt
index 6d48eb09..a2a3b70a 100644
--- a/templates/vc6dsplibexe.mpt
+++ b/templates/vc6dsplibexe.mpt
@@ -14,7 +14,8 @@ pdb                   = 1
 
 Release {
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   lib_modifier          = s
@@ -25,36 +26,41 @@ Release {
 
 Debug {
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /YX
-  lib_modifier          = sd
-  output_dir            = Debug
   intermediate_dir      = Debug
+  output_dir            = Debug
+  lib_modifier          = sd
 }
 
 MFC Release {
+  subsystem             = windows
   use_debug_libraries   = 0
-  compile_flags         = /W3 /GX /O2 /MD /GR
+  optimize              = 1
+  compile_flags         = /W3 /GX /MD /GR
   common_defines        = WIN32 _WINDOWS
   defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
-  lib_modifier          = mfcs
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
   debug_switch          =
+  lib_modifier          = mfcs
   use_mfc               = 1
 }
 
 MFC Debug {
+  subsystem             = windows
   use_debug_libraries   = 1
-  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  optimize              =
+  compile_flags         = /W3 /Gm /GX /Zi /MDd /GR /Gy
   common_defines        = WIN32 _WINDOWS
-  defines               = _DEBUG _AFX_DLL
+  defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
-  lib_modifier          = mfcsd
-  output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
+  output_dir            = MFC_Debug
+  lib_modifier          = mfcsd
   use_mfc               = 1
 }
 
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index 51c97474..fd21689e 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -21,8 +21,8 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-<%if(optimization)%>
-				Optimization="<%optimization%>"
+<%if(optimize)%>
+				Optimization="<%optimize%>"
 <%endif%>
 <%if(OptimizeForProcessor)%>
 				Optimization="<%OptimizeForProcessor%>"
diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt
index a92db533..b01ac6ba 100644
--- a/templates/vc7dll.mpt
+++ b/templates/vc7dll.mpt
@@ -17,7 +17,7 @@ Release {
 Debug {
   type_is_dynamic  = 1
   type_is_binary   = 1
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   defines          = _DEBUG
   output_dir       = .
@@ -39,7 +39,7 @@ Static Release {
 
 Static Debug {
   type_is_static   = 1
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   defines          = _DEBUG
   output_dir       = Static_Debug
@@ -64,7 +64,7 @@ MFC Release {
 MFC Debug {
   type_is_dynamic  = 1
   type_is_binary   = 1
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   defines          = _DEBUG
   output_dir       = MFC_Debug
@@ -88,7 +88,7 @@ Static MFC Release {
 
 Static MFC Debug {
   type_is_static   = 1
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   defines          = _DEBUG
   output_dir       = Static_MFC_Debug
diff --git a/templates/vc7exe.mpt b/templates/vc7exe.mpt
index 4f4d294c..8c3ac5fc 100644
--- a/templates/vc7exe.mpt
+++ b/templates/vc7exe.mpt
@@ -16,7 +16,7 @@ Release {
 }
 
 Debug {
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   defines          = _DEBUG
   output_dir       = .
@@ -35,7 +35,7 @@ Static Release {
 }
 
 Static Debug {
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   defines          = _DEBUG
   output_dir       = Static_Debug
@@ -56,7 +56,7 @@ MFC Release {
 }
 
 MFC Debug {
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   common_defines   = WIN32 _WINDOWS
   defines          = _DEBUG _AFXDLL
@@ -78,7 +78,7 @@ Static MFC Release {
 }
 
 Static MFC Debug {
-  optimization     = 0
+  optimize         = 0
   debug            = 1
   defines          = _DEBUG _AFXDLL
   output_dir       = Static_MFC_Debug