From b4145e9bdf14ea3da453b8e708f975b6cd42aded Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Sat, 28 Apr 2001 02:18:37 +0000
Subject: [PATCH] remove pstats for opt4

---
 dtool/Config.pp               | 8 ++++----
 dtool/pptempl/Global.gmsvc.pp | 9 ++++-----
 dtool/pptempl/Global.msvc.pp  | 8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 3d0aec7daf..6e7b607292 100644
--- a/dtool/Config.pp
+++ b/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,
diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp
index b540a7d434..ad9c9cada8 100644
--- a/dtool/pptempl/Global.gmsvc.pp
+++ b/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] 
diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp
index 0646b4e0d4..7c6c232e42 100644
--- a/dtool/pptempl/Global.msvc.pp
+++ b/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]