From d478348a7122d2a5059aa1deb4ac131879791b95 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Mon, 20 Aug 2001 20:48:14 +0000 Subject: [PATCH] allow conditional pstats --- dtool/Config.pp | 2 +- dtool/pptempl/Template.msvc.pp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 6b2eb46097..b72552fb54 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -293,7 +293,7 @@ // performance statistics? This requires NET to be available. By // default, we don't build PStats when OPTIMIZE = 4, although this is // 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? // Normally, these are stripped out when we build with OPTIMIZE = 4, but diff --git a/dtool/pptempl/Template.msvc.pp b/dtool/pptempl/Template.msvc.pp index 139855f4d4..7908a85066 100644 --- a/dtool/pptempl/Template.msvc.pp +++ b/dtool/pptempl/Template.msvc.pp @@ -175,7 +175,8 @@ // 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]] -// 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 #forscopes lib_target bin_target static_lib_target #if $[and $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]