From 49fce97b4cc8f990c82c8e7486a8237254ec714d Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 22 Jul 2009 01:50:14 +0000
Subject: [PATCH] issue with BUILD_TARGET

---
 dtool/pptempl/Template.gmsvc.pp | 20 +++++++++++---------
 dtool/pptempl/Template.msvc.pp  |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index ea9493a434..58ae9631ef 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -53,15 +53,17 @@
   #define real_lib_target_libs
   #define deferred_objs
   #forscopes lib_target
-    #if $[eq $[module $[TARGET],$[TARGET]],]
-      // This library is not on a metalib, so we can build it.
-      #set real_lib_targets $[real_lib_targets] $[TARGET]
-      #set real_lib_target_libs $[real_lib_target_libs] $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext]
-    #else
-      // This library is on a metalib, so we can't build it, but we
-      // should build all the obj's that go into it.
-      #set deferred_objs $[deferred_objs] \
-        $[patsubst %,$[%_obj],$[compile_sources]]
+    #if $[build_target]
+      #if $[eq $[module $[TARGET],$[TARGET]],]
+        // This library is not on a metalib, so we can build it.
+        #set real_lib_targets $[real_lib_targets] $[TARGET]
+        #set real_lib_target_libs $[real_lib_target_libs] $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext]
+      #else
+        // This library is on a metalib, so we can't build it, but we
+        // should build all the obj's that go into it.
+        #set deferred_objs $[deferred_objs] \
+          $[patsubst %,$[%_obj],$[compile_sources]]
+      #endif
     #endif
   #end lib_target
 
diff --git a/dtool/pptempl/Template.msvc.pp b/dtool/pptempl/Template.msvc.pp
index c629deea1e..57f04117e0 100644
--- a/dtool/pptempl/Template.msvc.pp
+++ b/dtool/pptempl/Template.msvc.pp
@@ -55,7 +55,7 @@
   #forscopes lib_target
     #if $[eq $[module $[TARGET],$[TARGET]],]
       // This library is not on a metalib, so we can build it.
-      #set real_lib_targets $[real_lib_targets] $[TARGET]
+      #set real_lib_targets $[real_lib_targets] $[active_target]
     #else
       // This library is on a metalib, so we can't build it, but we
       // should build all the obj's that go into it.