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

remove those annoying .NOTPARALLEL things

Browse Source
This commit is contained in:
David Rose 2009-06-24 22:00:13 +00:00
parent aa860e9554
commit 63d1b206a0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,7 +375,7 @@ $[varname] = $[sources]
// not parallel (requires gmake 3.79) because of link.exe conflicts in TMP dir (see audiotraits dir) // not parallel (requires gmake 3.79) because of link.exe conflicts in TMP dir (see audiotraits dir)
#if $[or $[GENERATE_BUILDDATE],$[WIN_RESOURCE_FILE]] #if $[or $[GENERATE_BUILDDATE],$[WIN_RESOURCE_FILE]]
#define resource_file $[or $[WIN_RESOURCE_FILE],$[dtool_ver_dir_cyg]/version.rc] #define resource_file $[or $[WIN_RESOURCE_FILE],$[dtool_ver_dir_cyg]/version.rc]
.NOTPARALLEL $[target] : $[sources] $[static_lib_dependencies] $[resource_file] $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%] $[target] : $[sources] $[static_lib_dependencies] $[resource_file] $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%]
// first generate builddate for rc compiler using compiler preprocessor // first generate builddate for rc compiler using compiler preprocessor
#define ver_resource "$[ODIR]\$[lib_prefix]$[TARGET].res" #define ver_resource "$[ODIR]\$[lib_prefix]$[TARGET].res"
@ -389,7 +389,7 @@ $[TAB] $[link_lib_c]
#endif #endif
#else #else
.NOTPARALLEL $[target] : $[sources] $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%] $[target] : $[sources] $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%]
#if $[filter %.cxx %.cpp %.yxx %.lxx,$[get_sources]] #if $[filter %.cxx %.cpp %.yxx %.lxx,$[get_sources]]
$[TAB] $[link_lib_c++] $[TAB] $[link_lib_c++]
#else #else
@ -568,7 +568,7 @@ $[VERHEADER_DEPENDENTS] : $[verhdr_to_gen]
$[idl_to_gen] : $[GENERATED_IDL_DEPENDENCIES] $[idl_to_gen] : $[GENERATED_IDL_DEPENDENCIES]
$[TAB] $[IDL_GENERATOR_RULE] $[TAB] $[IDL_GENERATOR_RULE]
.NOTPARALLEL $[ODIR]/$[IDL_BASENAME].h : $[idl_to_gen] $[ODIR]/$[IDL_BASENAME].h : $[idl_to_gen]
$[TAB] $[MIDL_COMMAND] $[TAB] $[MIDL_COMMAND]
// this is a complete hack. I dont know how add a generated .h to the dependency list of $[IDL_BASENAME].cpp. // this is a complete hack. I dont know how add a generated .h to the dependency list of $[IDL_BASENAME].cpp.