Browse Source

allow conditional pstats

cxgeorge 24 years ago
parent
commit
d478348a71
2 changed files with 3 additions and 2 deletions
  1. 1 1
      dtool/Config.pp
  2. 2 1
      dtool/pptempl/Template.msvc.pp

+ 1 - 1
dtool/Config.pp

@@ -293,7 +293,7 @@
 // performance statistics?  This requires NET to be available.  By
 // performance statistics?  This requires NET to be available.  By
 // default, we don't build PStats when OPTIMIZE = 4, although this is
 // default, we don't build PStats when OPTIMIZE = 4, although this is
 // possible.
 // possible.
-#defer DO_PSTATS $[and $[HAVE_NET],$[< $[OPTIMIZE], 4]]
+#defer DO_PSTATS $[or $[and $[HAVE_NET],$[< $[OPTIMIZE], 4]], $[DO_PSTATS]]
 
 
 // Do you want to include the "debug" and "spam" Notify messages?
 // Do you want to include the "debug" and "spam" Notify messages?
 // Normally, these are stripped out when we build with OPTIMIZE = 4, but
 // Normally, these are stripped out when we build with OPTIMIZE = 4, but

+ 2 - 1
dtool/pptempl/Template.msvc.pp

@@ -175,7 +175,8 @@
 // And $[libs] is the set of libraries we will link with.
 // And $[libs] is the set of libraries we will link with.
 #defer libs $[unique $[actual_local_libs:%=%$[dllext]] $[patsubst %:c,,%:m %,%$[dllext],$[OTHER_LIBS]] $[get_libs]]
 #defer libs $[unique $[actual_local_libs:%=%$[dllext]] $[patsubst %:c,,%:m %,%$[dllext],$[OTHER_LIBS]] $[get_libs]]
 
 
-// for single-processor builds, write out *_composite.cxx files that include all composite
+// for single-processor builds (all nmake msvc-type builds can use only a single-proc), 
+// write out *_composite.cxx files that include all composite
 // files into 1 in order to speed the build of our heavily templated source
 // files into 1 in order to speed the build of our heavily templated source
 #forscopes lib_target bin_target static_lib_target
 #forscopes lib_target bin_target static_lib_target
 #if $[and $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]
 #if $[and $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]