From 99f74bea2cc4378198f2a30da84a9437de6b021c Mon Sep 17 00:00:00 2001
From: georges <>
Date: Thu, 28 Dec 2000 00:42:35 +0000
Subject: [PATCH] fix multiproc issues, DTOOL_INSTALL dependency

---
 dtool/pptempl/Global.gmsvc.pp   |  6 +++---
 dtool/pptempl/Template.gmsvc.pp | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp
index b702ca71e6..65d49f959b 100644
--- a/dtool/pptempl/Global.gmsvc.pp
+++ b/dtool/pptempl/Global.gmsvc.pp
@@ -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]]"
diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index 92e2c2a1b2..e0b762647b 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -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