From 7a8e55e10c41fe039fc52bc28c8005b49a883507 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 20 Oct 2000 00:57:46 +0000
Subject: [PATCH] *** empty log message ***

---
 dtool/pptempl/Global.msvc.pp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp
index 4f7c0bc8e2..91f615e485 100644
--- a/dtool/pptempl/Global.msvc.pp
+++ b/dtool/pptempl/Global.msvc.pp
@@ -20,9 +20,11 @@
   #foreach lib $[complete_libs]
     // Only consider libraries that we're actually building.
     #if $[all_libs $[and $[build_directory],$[build_target]],$[lib]]
-      #define modmeta $[module $[target],$[lib]]
+      #define modmeta $[module $[TARGET],$[lib]]
       #if $[ne $[modmeta],]
-        #set actual_libs $[actual_libs] $[modmeta]
+        #if $[ne $[modmeta],$[target]]  // We don't link with ourselves.
+          #set actual_libs $[actual_libs] $[modmeta]
+        #endif
       #else
         #set actual_libs $[actual_libs] $[lib]
       #endif
@@ -42,9 +44,6 @@
   #end file
 #end decygwin
 
-#defer CC cl
-#defer CXX cl
-
 // Define this if we want to make .sbr files.
 #defer BROWSEINFO_FLAG -Fr$[target:%.obj=%.sbr]
 
@@ -60,10 +59,13 @@
 
 #defer extra_cflags -nologo -W3 -EHsc -Zm250 -D_WINDOWS -DWIN32 -D_WINDLL -DSTRICT -DPENV_WIN32 -DWIN32_VC
 #defer extra_so_lflags -DLL -NOLOGO
-#defer extra_bin_lflags = -NOLOGO
+#defer extra_bin_lflags -NOLOGO
 
-#defer COMPILE_C $[CC] -c -Fo$[target] $[decygwin %,-I"%",$[ipath]] $[flags] $[extra_cflags] $[source]
+#defer COMPILE_C cl -c -Fo$[target] $[decygwin %,-I"%",$[ipath]] $[flags] $[extra_cflags] $[source]
 #defer COMPILE_C++ $[COMPILE_C]
 
-#defer SHARED_LIB_C link $[LFLAGS_OPT$[OPTIMIZE]] $[extra_so_lflags] $[decygwin %,-LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] $[sources] -OUT:$[target]
+#defer SHARED_LIB_C link $[LFLAGS_OPT$[OPTIMIZE]] $[extra_so_lflags] $[sources] $[decygwin %,-LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] -OUT:$[target]
 #defer SHARED_LIB_C++ $[SHARED_LIB_C]
+
+#defer LINK_BIN_C link $[LFLAGS_OPT$[OPTIMIZE]] $[extra_bin_lflags] $[sources] $[decygwin %,-LIBPATH:"%",$[lpath]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]] -OUT:$[target]
+#defer LINK_BIN_C++ $[LINK_BIN_C]