TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix multiproc issues, DTOOL_INSTALL dependency

Browse Source
This commit is contained in:
georges 2000-12-28 00:42:35 +00:00
parent 83c0669bea
commit 99f74bea2c
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,9 +96,9 @@
#defer STATIC_LIB_C lib /nologo $[sources] /OUT:"$[osfilename $[target]]"
#defer STATIC_LIB_C++ $[STATIC_LIB_C]
#defer ver_resource $[directory]\ver.res
#defer SHARED_LIB_C link /nologo /dll $[LDFLAGS_OPT$[OPTIMIZE]] $[sources] "$[ver_resource]" $[decygwin %,/LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] /OUT:"$[osfilename $[target]]"
//#defer ver_resource $[directory]\ver.res
//#defer SHARED_LIB_C link /nologo /dll $[LDFLAGS_OPT$[OPTIMIZE]] /OUT:"$[osfilename $[target]]" $[sources] "$[ver_resource]" $[decygwin %,/LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]]
#defer SHARED_LIB_C link /nologo /dll $[LDFLAGS_OPT$[OPTIMIZE]] /OUT:"$[osfilename $[target]]" $[sources] $[decygwin %,/LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]]
#defer SHARED_LIB_C++ $[SHARED_LIB_C]
#defer LINK_BIN_C link /nologo $[LDFLAGS_OPT$[OPTIMIZE]] $[sources] $[decygwin %,/LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] /OUT:"$[osfilename $[target]]"

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

@ -33,9 +33,16 @@
#end file
#end decygwin
#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
// cant use DTOOL_INSTALL since may not be attached
//#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
//#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
#define dtool_ver_dir_cyg ../../../dtool/src/dtoolbase
#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
//////////////////////////////////////////////////////////////////////
#if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]
//////////////////////////////////////////////////////////////////////
@ -335,13 +342,13 @@ $[varname] = $[sources]
#define flags $[get_cflags] $[C++FLAGS] $[CFLAGS_OPT$[OPTIMIZE]] $[CFLAGS_SHARED] $[building_var:%=/D%]
$[target] : $[sources] $[so_dir]/stamp $[dtool_ver_dir_cyg]/version.rc
// first generate builddate for rc compiler
// uses different .res names, no rm verdate.h to allow multi-proc build to work
cl /nologo /EP "$[dtool_ver_dir]\verdate.cpp" > "$[dtool_ver_dir]\verdate.h"
rc /n /fo"$[ver_resource]" $[filter /D%, $[flags]] "$[dtool_ver_dir]\version.rc"
rm -f "$[dtool_ver_dir]\verdate.h"
rc /n /fo"$[target]-ver.res" $[filter /D%, $[flags]] "$[dtool_ver_dir]\version.rc"
#if $[filter %.cxx %.yxx %.lxx,$[get_sources]]
$[SHARED_LIB_C++]
$[SHARED_LIB_C++] "$[target]-ver.res"
#else
$[SHARED_LIB_C]
$[SHARED_LIB_C] "$[target]-ver.res"
#endif
$[so_dir]/lib$[TARGET]$[dllext].lib : $[so_dir]/lib$[TARGET]$[dllext].dll