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

only use dllbase.txt if DTOOL_INSTALL is defined

Browse Source
This commit is contained in:
cxgeorge 2002-03-29 01:30:55 +00:00
parent 548b2c871d
commit 5d52a23afb
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,10 +172,13 @@
#defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]"
#defer STATIC_LIB_C++ $[STATIC_LIB_C]
// if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions
#if $[ne $[DTOOL_INSTALL],]
// use predefined bases to speed dll loading and simplify debugging
#defer DLLNAMEBASE lib$[TARGET]$[dllext]
#defer DLLBASEADDRFILENAME dllbase.txt
#defer DLLBASEARG "/BASE:@$[dtool_ver_dir]\$[DLLBASEADDRFILENAME],$[DLLNAMEBASE]"
#endif
//#defer ver_resource $[directory]\ver.res
//#defer SHARED_LIB_C link /nologo /dll /VERBOSE:LIB $[LDFLAGS_OPT$[OPTIMIZE]] /OUT:"$[osfilename $[target]]" $[sources] $[decygwin %,/LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]]

3
dtool/pptempl/Global.msvc.pp
View File

@ -153,10 +153,13 @@
#define ver_resource
#endif
// if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions
#if $[ne $[DTOOL_INSTALL],]
// use predefined bases to speed dll loading and simplify debugging
#defer DLLNAMEBASE lib$[TARGET]$[dllext]
#defer DLLBASEADDRFILENAME dllbase.txt
#defer DLLBASEARG "/BASE:@$[dtool_ver_dir]\$[DLLBASEADDRFILENAME],$[DLLNAMEBASE]"
#endif
#defer SHARED_LIB_C $[LINKER] /nologo /dll $[LDFLAGS_OPT$[OPTIMIZE]] $[DLLBASEARG] $[sources] $[ver_resource] $[decygwin %,/LIBPATH:"%",$[lpath] $[EXTRA_LIBPATH]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] /OUT:"$[osfilename $[target]]"
#defer SHARED_LIB_C++ $[SHARED_LIB_C]

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

@ -33,8 +33,10 @@
#end file
#end decygwin
#if $[ne $[DTOOL_INSTALL],]
#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
#endif
//////////////////////////////////////////////////////////////////////
#if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]

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

@ -38,8 +38,11 @@
// should overwrite read-only files
#define NT_COPYCMD xcopy /Y /Q /R
#if $[ne $[DTOOL_INSTALL],]
#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
#endif
#define win_temp_output_dir $[decygwin %,%,$[TEMP]]
//////////////////////////////////////////////////////////////////////