reorg things a little

dtool/pptempl/Global.gmsvc.pp

@@ -77,25 +77,13 @@
 
 #include $[DTOOL]/pptempl/compilerSettings.pp
 
-#if $[CHECK_SYNTAX_ONLY]
-#define END_CFLAGS $[END_CFLAGS] /Zs 
-#endif 
-  
-#if $[GEN_ASSEMBLY]
-#define END_CFLAGS $[END_CFLAGS] /FAs
-#endif 
-
-#if $[PREPROCESSOR_OUTPUT]
-#define END_CFLAGS $[END_CFLAGS] /E 
-#endif 
-
 #defer CDEFINES_OPT1 _DEBUG $[dlink_all_static]
 #defer CDEFINES_OPT2 _DEBUG $[dlink_all_static]
 #defer CDEFINES_OPT3 $[dlink_all_static]
 #defer CDEFINES_OPT4 NDEBUG $[dlink_all_static]
 
 //  /GZ disables OPT flags, so OPT1 only
-#defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] /GZ $[DEBUGFLAGS] 
+#defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[OPT1FLAGS] $[DEBUGFLAGS] 
 #defer CFLAGS_OPT2 $[CDEFINES_OPT2:%=/D%] $[COMMONFLAGS] $[DEBUGFLAGS] $[OPTFLAGS] 
 #defer CFLAGS_OPT3 $[CDEFINES_OPT3:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS] 
 #defer CFLAGS_OPT4 $[CDEFINES_OPT4:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS] 

dtool/pptempl/Global.msvc.pp

@@ -78,24 +78,12 @@
 
 #include $[DTOOL]/pptempl/compilerSettings.pp
 
-#if $[CHECK_SYNTAX_ONLY]
-#define END_CFLAGS $[END_CFLAGS] /Zs 
-#endif 
-  
-#if $[GEN_ASSEMBLY]
-#define END_CFLAGS $[END_CFLAGS] /FAs
-#endif 
-
-#if $[PREPROCESSOR_OUTPUT]
-#define END_CFLAGS $[END_CFLAGS] /E 
-#endif 
-
 #defer CDEFINES_OPT1 _DEBUG $[dlink_all_static]
 #defer CDEFINES_OPT2 _DEBUG $[dlink_all_static]
 #defer CDEFINES_OPT3 $[dlink_all_static]
 #defer CDEFINES_OPT4 NDEBUG $[dlink_all_static]
 
-#defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] /GZ $[DEBUGFLAGS]
+#defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[OPT1FLAGS] $[DEBUGFLAGS]
 #defer CFLAGS_OPT2 $[CDEFINES_OPT2:%=/D%] $[COMMONFLAGS] $[DEBUGFLAGS] $[OPTFLAGS]
 #defer CFLAGS_OPT3 $[CDEFINES_OPT3:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
 #defer CFLAGS_OPT4 $[CDEFINES_OPT4:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]

dtool/pptempl/compilerSettings.pp

@@ -5,6 +5,7 @@
   #define LIBBER lib
   #define COMMONFLAGS /Gi-
   #define OPTFLAGS /O2 /Ob1 /G6
+  #define OPT1FLAGS /GZ 
   #defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
   #define RELEASEFLAGS /MD
   
@@ -17,6 +18,7 @@
   #define LIBBER lib
   #define COMMONFLAGS
   #define OPTFLAGS /O2 /Ogity /G6
+  #define OPT1FLAGS /GZ   
   #defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
   #define RELEASEFLAGS /MD
   #define EXTRA_LIBPATH
@@ -29,6 +31,7 @@
 //  #define OPTFLAGS /O3 /G6 /Qvc6 /Qipo /QaxW /Qvec_report1 
   #define OPTFLAGS /O3 /G6 /Qvc6 /Qip
   #define DEBUGFLAGS /MDd /Zi /Qinline_debug_info
+  #define OPT1FLAGS /GZ /Od
   #define RELEASEFLAGS /MD
   // We assume the Intel compiler installation dir is mounted as /ia32.
   #define EXTRA_LIBPATH /ia32/lib
@@ -37,3 +40,16 @@
   #error Invalid value specified for USE_COMPILER.
 #endif
 
+#if $[CHECK_SYNTAX_ONLY]
+#define END_CFLAGS $[END_CFLAGS] /Zs 
+#endif 
+  
+#if $[GEN_ASSEMBLY]
+#define END_CFLAGS $[END_CFLAGS] /FAs
+#endif 
+
+#if $[PREPROCESSOR_OUTPUT]
+#define END_CFLAGS $[END_CFLAGS] /E 
+#endif 
+
+