TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

adjust 2-proc builds

Browse Source
This commit is contained in:
cxgeorge 2001-10-30 01:37:20 +00:00
parent b5a1a899ac
commit e19f365f19
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/pptempl/Global.pp
View File

@ -283,7 +283,7 @@
// is. // is.
#defer active_target $[if $[build_target],$[TARGET]] #defer active_target $[if $[build_target],$[TARGET]]
#if $[and $[or $[eq $[BUILD_TYPE],msvc], $[and $[eq $[BUILD_TYPE],gmsvc], $[eq $[NUMBER_OF_PROCESSORS],1]]], $[eq $[NO_COMBINED_SOURCES],]] #if $[USE_SINGLE_COMPOSITE_SOURCEFILE]
// for non-composite dirs, want to avoid returning the composite default name // for non-composite dirs, want to avoid returning the composite default name
#defer get_combined_sources $[if $[ne $[COMBINED_SOURCES],], $[TARGET]_composite.cxx,] #defer get_combined_sources $[if $[ne $[COMBINED_SOURCES],], $[TARGET]_composite.cxx,]
#else #else
@ -326,7 +326,7 @@
$[IF_IPC_SOURCES] \ $[IF_IPC_SOURCES] \
$[IF_PYTHON_SOURCES] $[IF_PYTHON_SOURCES]
#defer included_sources $[INCLUDED_SOURCES] $[if $[HAVE_ZLIB],$[IF_ZLIB_INCLUDED_SOURCES]] $[if $[HAVE_NET],$[IF_NET_INCLUDED_SOURCES]] $[if $[and $[eq $[NUMBER_OF_PROCESSORS],1], $[eq $[NO_COMBINED_SOURCES],]], $[COMBINED_SOURCES]] #defer included_sources $[INCLUDED_SOURCES] $[if $[HAVE_ZLIB],$[IF_ZLIB_INCLUDED_SOURCES]] $[if $[HAVE_NET],$[IF_NET_INCLUDED_SOURCES]] $[if $[USE_SINGLE_COMPOSITE_SOURCEFILE], $[COMBINED_SOURCES]]
// This variable returns the set of sources that are to be // This variable returns the set of sources that are to be
// interrogated for the current target. // interrogated for the current target.

4
dtool/pptempl/Template.gmsvc.pp
View File

@ -174,7 +174,7 @@
// for single-processor builds, write out *_composite.cxx files that include all composite // for single-processor builds, 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 $[NUMBER_OF_PROCESSORS],1], $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]] #if $[and $[<= $[NUMBER_OF_PROCESSORS],2], $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]
#output $[TARGET]_composite.cxx notouch #output $[TARGET]_composite.cxx notouch
#format collapse #format collapse
/* Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. */ /* Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. */
@ -237,7 +237,7 @@ $[TAB] rm -f $[patsubst %.yxx %.lxx,%.cxx,$[yxx_so_sources] $[yxx_st_sources] $[
#if $[ne $[DEPENDENCY_CACHE_FILENAME],] #if $[ne $[DEPENDENCY_CACHE_FILENAME],]
$[TAB] rm -f $[DEPENDENCY_CACHE_FILENAME] $[TAB] rm -f $[DEPENDENCY_CACHE_FILENAME]
#endif #endif
#if $[eq $[NUMBER_OF_PROCESSORS],1] #if $[<= $[NUMBER_OF_PROCESSORS],2]
$[TAB] rm -f *_composite.cxx // eliminate generated *_composite.cxx files for uniprocessor builds $[TAB] rm -f *_composite.cxx // eliminate generated *_composite.cxx files for uniprocessor builds
#endif #endif