remove pstats for opt4

dtool/Config.pp

@@ -403,10 +403,10 @@
 // options to interrogate, guaranteeing that the correct interfaces
 // are generated.  Do not include -D here; that will be supplied
 // automatically.
-#defer CDEFINES_OPT1 _DEBUG
-#defer CDEFINES_OPT2 _DEBUG
-#defer CDEFINES_OPT3
-#defer CDEFINES_OPT4 NDEBUG
+#defer CDEFINES_OPT1 _DEBUG DO_PSTATS
+#defer CDEFINES_OPT2 _DEBUG DO_PSTATS
+#defer CDEFINES_OPT3 DO_PSTATS
+#defer CDEFINES_OPT4 NDEBUG $[if $[ne $[DO_PSTATS],],DO_PSTATS]
 
 // What additional flags should be passed for each value of OPTIMIZE
 // (above)?  We separate out the compiler-optimization flags, above,

dtool/pptempl/Global.gmsvc.pp

@@ -61,7 +61,6 @@
 
 #define CFLAGS_SHARED
 
-
 // Define LINK_ALL_STATIC to generate static libs instead of DLL's.
 #if $[ne $[LINK_ALL_STATIC],]
   #define dlink_all_static LINK_ALL_STATIC
@@ -77,10 +76,10 @@
 
 #include $[DTOOL]/pptempl/compilerSettings.pp
 
-#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 CDEFINES_OPT1 _DEBUG $[dlink_all_static] DO_PSTATS
+#defer CDEFINES_OPT2 _DEBUG $[dlink_all_static] DO_PSTATS
+#defer CDEFINES_OPT3 $[dlink_all_static] DO_PSTATS
+#defer CDEFINES_OPT4 NDEBUG $[dlink_all_static] $[if $[ne $[DO_PSTATS],],DO_PSTATS]
 
 //  /GZ disables OPT flags, so OPT1 only
 #defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[OPT1FLAGS] $[DEBUGFLAGS] 

dtool/pptempl/Global.msvc.pp

@@ -78,10 +78,10 @@
 
 #include $[DTOOL]/pptempl/compilerSettings.pp
 
-#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 CDEFINES_OPT1 _DEBUG $[dlink_all_static] DO_PSTATS
+#defer CDEFINES_OPT2 _DEBUG $[dlink_all_static] DO_PSTATS
+#defer CDEFINES_OPT3 $[dlink_all_static] DO_PSTATS
+#defer CDEFINES_OPT4 NDEBUG $[dlink_all_static] $[if $[ne $[DO_PSTATS],],DO_PSTATS]
 
 #defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[OPT1FLAGS] $[DEBUGFLAGS]
 #defer CFLAGS_OPT2 $[CDEFINES_OPT2:%=/D%] $[COMMONFLAGS] $[DEBUGFLAGS] $[OPTFLAGS]