From 5d52a23afb17f00b031c7e6ff95551cbd16d2e4a Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Fri, 29 Mar 2002 01:30:55 +0000
Subject: [PATCH] only use dllbase.txt if DTOOL_INSTALL is defined

---
 dtool/pptempl/Global.gmsvc.pp   | 3 +++
 dtool/pptempl/Global.msvc.pp    | 3 +++
 dtool/pptempl/Template.gmsvc.pp | 2 ++
 dtool/pptempl/Template.msvc.pp  | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp
index 6ffb4998d0..df28f15422 100644
--- a/dtool/pptempl/Global.gmsvc.pp
+++ b/dtool/pptempl/Global.gmsvc.pp
@@ -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]] 
diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp
index fcab9f8612..2246a042d6 100644
--- a/dtool/pptempl/Global.msvc.pp
+++ b/dtool/pptempl/Global.msvc.pp
@@ -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]
diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index 774e604e61..c1a907c370 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -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]]
diff --git a/dtool/pptempl/Template.msvc.pp b/dtool/pptempl/Template.msvc.pp
index 0b9a3eddcc..e343ee94fa 100644
--- a/dtool/pptempl/Template.msvc.pp
+++ b/dtool/pptempl/Template.msvc.pp
@@ -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]]
 
 //////////////////////////////////////////////////////////////////////