RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix multi-proc nmake case to use new opt

This commit is contained in:
cxgeorge 2001-08-09 01:22:22 +00:00
parent ed9e517399
commit 94b4150e11
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/pptempl/Global.pp
View File

@ -283,7 +283,7 @@
// is.
#defer active_target $[if $[build_target],$[TARGET]]
#if $[and $[eq $[NUMBER_OF_PROCESSORS],1], $[eq $[NO_COMBINED_SOURCES],]]
#if $[and $[or $[eq $[BUILD_TYPE],msvc], $[and $[eq $[BUILD_TYPE],gmsvc], $[eq $[NUMBER_OF_PROCESSORS],1]]], $[eq $[NO_COMBINED_SOURCES],]]
// for non-composite dirs, want to avoid returning the composite default name
#defer get_combined_sources $[if $[ne $[COMBINED_SOURCES],], $[TARGET]_composite.cxx,]
#else

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

@ -178,7 +178,7 @@
// 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
#forscopes lib_target bin_target static_lib_target
#if $[and $[eq $[NUMBER_OF_PROCESSORS],1], $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]
#if $[and $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]
#output $[TARGET]_composite.cxx
#format collapse
/* Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. */
@ -236,9 +236,7 @@ $[TAB] -del /f $[patsubst %.yxx %.lxx,%.cxx,$[yxx_so_sources] $[yxx_st_sources]
#if $[ne $[DEPENDENCY_CACHE_FILENAME],]
$[TAB] -del /f $[DEPENDENCY_CACHE_FILENAME]
#endif
#if $[eq $[NUMBER_OF_PROCESSORS],1]
$[TAB] rm -f *_composite.cxx // eliminate generated *_composite.cxx files for uniprocessor builds
#endif
clean-igate :
#forscopes metalib_target lib_target ss_lib_target