From 065b130d6495d64fb81fdbeae248b5624964c988 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 17 Jun 2010 18:15:15 +0000
Subject: [PATCH] libp3tinyxml_mt

---
 direct/src/plugin/Sources.pp         |  4 ++--
 direct/src/plugin_activex/Sources.pp |  2 +-
 direct/src/plugin_npapi/Sources.pp   |  2 +-
 panda/src/dxml/Sources.pp            | 26 ++++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/direct/src/plugin/Sources.pp b/direct/src/plugin/Sources.pp
index bdae4e5324..dad051c6d1 100644
--- a/direct/src/plugin/Sources.pp
+++ b/direct/src/plugin/Sources.pp
@@ -117,7 +117,7 @@
   #define LINK_FORCE_STATIC_RELEASE_C_RUNTIME $[P3D_PLUGIN_MT]
 
   #define OTHER_LIBS \
-    p3tinyxml $[if $[OSX_PLATFORM],subprocbuffer]
+    p3tinyxml$[_MT] $[if $[OSX_PLATFORM],subprocbuffer]
 
   #define COMBINED_SOURCES p3d_plugin_composite1.cxx
   #define SOURCES $[COREAPI_SOURCES]
@@ -206,7 +206,7 @@
   #define SOURCES $[PLUGIN_COMMON_SOURCES]
 
 #end static_lib_target
-#endif
+#endif  // $[P3D_PLUGIN_MT]
 
 
 
diff --git a/direct/src/plugin_activex/Sources.pp b/direct/src/plugin_activex/Sources.pp
index 07f64291d8..680c575014 100755
--- a/direct/src/plugin_activex/Sources.pp
+++ b/direct/src/plugin_activex/Sources.pp
@@ -15,7 +15,7 @@
 
   #define LOCAL_LIBS plugin_common$[_MT]
   #define LINK_FORCE_STATIC_RELEASE_C_RUNTIME $[P3D_PLUGIN_MT]
-  #define OTHER_LIBS p3tinyxml
+  #define OTHER_LIBS p3tinyxml$[_MT]
 
   #define COMBINED_SOURCES \
     $[TARGET]_composite1.cxx
diff --git a/direct/src/plugin_npapi/Sources.pp b/direct/src/plugin_npapi/Sources.pp
index a9dfd7d09d..2dce19a624 100644
--- a/direct/src/plugin_npapi/Sources.pp
+++ b/direct/src/plugin_npapi/Sources.pp
@@ -19,7 +19,7 @@
 
   #define LOCAL_LIBS plugin_common$[_MT]
   #define LINK_FORCE_STATIC_RELEASE_C_RUNTIME $[P3D_PLUGIN_MT]
-  #define OTHER_LIBS p3tinyxml
+  #define OTHER_LIBS p3tinyxml$[_MT]
 
   #define COMBINED_SOURCES \
     $[TARGET]_composite1.cxx
diff --git a/panda/src/dxml/Sources.pp b/panda/src/dxml/Sources.pp
index c2067bbf78..f2b58898ef 100644
--- a/panda/src/dxml/Sources.pp
+++ b/panda/src/dxml/Sources.pp
@@ -17,6 +17,32 @@
 
 #end static_lib_target
 
+#if $[P3D_PLUGIN_MT]
+#begin static_lib_target
+//
+// libp3tinyxml_mt.lib, the same as above, with /MT compilation.  This
+// is needed when building the /MT plugin.
+//
+  #define TARGET p3tinyxml_mt
+  #define LINK_FORCE_STATIC_RELEASE_C_RUNTIME 1
+
+  #define COMBINED_SOURCES tinyxml_composite1.cxx
+
+  #define SOURCES \
+     tinyxml.h
+
+  #define INCLUDED_SOURCES  \
+     tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp
+
+  #define INSTALL_HEADERS \
+    tinyxml.h
+
+  #define EXTRA_CDEFS TIXML_USE_STL
+  #define C++FLAGS $[CFLAGS_SHARED]
+
+#end static_lib_target
+#endif  // $[P3D_PLUGIN_MT]
+
 #begin lib_target
   #define TARGET dxml