From 4f90af14ab7794f286b9880d2171bcddbe71b97b Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Wed, 6 Jun 2001 02:47:17 +0000
Subject: [PATCH] use combined srcs

---
 panda/src/chancfg/Sources.pp             | 15 ++++++++++-----
 panda/src/chancfg/chancfg.cxx            |  2 +-
 panda/src/chancfg/chancfg.h              |  2 +-
 panda/src/chancfg/chancfg_composite1.cxx |  6 ++++++
 panda/src/chancfg/chancfg_composite2.cxx |  5 +++++
 panda/src/chancfg/chanlayout.cxx         |  2 +-
 panda/src/chancfg/chanlayout.h           |  4 ++--
 panda/src/chancfg/chansetup.h            |  2 +-
 panda/src/chancfg/chanwindow.h           |  2 +-
 9 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 panda/src/chancfg/chancfg_composite1.cxx
 create mode 100644 panda/src/chancfg/chancfg_composite2.cxx

diff --git a/panda/src/chancfg/Sources.pp b/panda/src/chancfg/Sources.pp
index cc8a70713e..62aeeae4d6 100644
--- a/panda/src/chancfg/Sources.pp
+++ b/panda/src/chancfg/Sources.pp
@@ -6,12 +6,17 @@
   #define LOCAL_LIBS \
     putil display sgattrib linmath graph sgraph gobj display gsgbase \
     mathutil
+    
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx    
 
   #define SOURCES \
-    chancfg.I chancfg.N chancfg.cxx chancfg.h chanlayout.I \
-    chanlayout.cxx chanlayout.h chanparse.I chanparse.cxx chanparse.h \
-    chansetup.I chansetup.cxx chansetup.h chanwindow.I chanwindow.cxx \
-    chanwindow.h
+    chancfg.I chancfg.N chancfg.h chanlayout.I \
+    chanlayout.h chanparse.I chanparse.h \
+    chansetup.I chansetup.h chanwindow.I chanwindow.h
+    
+  #define INCLUDED_SOURCES \
+    chancfg.cxx chanlayout.cxx chanparse.cxx  \
+     chansetup.cxx chanwindow.cxx
 
   #define INSTALL_HEADERS \
     chancfg.I chancfg.h chanlayout.I chanlayout.h chansetup.I \
@@ -21,7 +26,7 @@
   #define INSTALL_CONFIG \
     layout_db setup_db window_db
 
-  #define PRECOMPILED_HEADER chancfg_headers.h 
+//  #define PRECOMPILED_HEADER chancfg_headers.h 
 
   #define IGATESCAN chancfg.h
 
diff --git a/panda/src/chancfg/chancfg.cxx b/panda/src/chancfg/chancfg.cxx
index 6777dad75f..226feeece6 100644
--- a/panda/src/chancfg/chancfg.cxx
+++ b/panda/src/chancfg/chancfg.cxx
@@ -130,7 +130,7 @@ INLINE bool ConfigDefined(std::string sym) {
     (WindowDB->find(sym) != WindowDB->end());
 }
 
-typedef std::pvector<SetupItem> SVec;
+typedef pvector<SetupItem> SVec;
 
 bool ChanCheckLayouts(SetupSyms& S) {
   if (S.empty())
diff --git a/panda/src/chancfg/chancfg.h b/panda/src/chancfg/chancfg.h
index 1afa15b710..6d06a3f597 100644
--- a/panda/src/chancfg/chancfg.h
+++ b/panda/src/chancfg/chancfg.h
@@ -72,7 +72,7 @@ private:
     INLINE void setString(const std::string& v) { _str = v; }
     INLINE std::string getString(void) const { return _str; }
   };
-  typedef std::pmap<Field, Types> Fields;
+  typedef pmap<Field, Types> Fields;
   Fields _fields;
 public:
   ChanCfgOverrides(void);
diff --git a/panda/src/chancfg/chancfg_composite1.cxx b/panda/src/chancfg/chancfg_composite1.cxx
new file mode 100644
index 0000000000..011be866e7
--- /dev/null
+++ b/panda/src/chancfg/chancfg_composite1.cxx
@@ -0,0 +1,6 @@
+
+#include "chancfg.cxx"
+#include "chanlayout.cxx"
+#include "chanparse.cxx"
+
+
diff --git a/panda/src/chancfg/chancfg_composite2.cxx b/panda/src/chancfg/chancfg_composite2.cxx
new file mode 100644
index 0000000000..1c2ef20886
--- /dev/null
+++ b/panda/src/chancfg/chancfg_composite2.cxx
@@ -0,0 +1,5 @@
+
+#include "chansetup.cxx"
+#include "chanwindow.cxx"
+
+
diff --git a/panda/src/chancfg/chanlayout.cxx b/panda/src/chancfg/chanlayout.cxx
index 4313ba0097..85b4dc5700 100644
--- a/panda/src/chancfg/chanlayout.cxx
+++ b/panda/src/chancfg/chanlayout.cxx
@@ -44,7 +44,7 @@ LayoutParseFunctor::~LayoutParseFunctor(void) {
   return;
 }
 
-typedef std::pvector<bool> LayoutBoolVec;
+typedef pvector<bool> LayoutBoolVec;
 
 void LayoutParseFunctor::operator()(std::string S) {
   std::string sym;
diff --git a/panda/src/chancfg/chanlayout.h b/panda/src/chancfg/chanlayout.h
index f4146fbe92..820723fdbb 100644
--- a/panda/src/chancfg/chanlayout.h
+++ b/panda/src/chancfg/chanlayout.h
@@ -28,7 +28,7 @@
 #include "chanviewport.h"
 
 
-typedef std::pvector<ChanViewport> LayoutRegionVec;
+typedef pvector<ChanViewport> LayoutRegionVec;
 
 class LayoutItem {
 private:
@@ -46,7 +46,7 @@ public:
   INLINE const ChanViewport& operator[](int);
 };
 
-typedef std::pmap<std::string, LayoutItem> LayoutType;
+typedef pmap<std::string, LayoutItem> LayoutType;
 
 extern LayoutType* LayoutDB;
 
diff --git a/panda/src/chancfg/chansetup.h b/panda/src/chancfg/chansetup.h
index d64e4995b4..cadd64924b 100644
--- a/panda/src/chancfg/chansetup.h
+++ b/panda/src/chancfg/chansetup.h
@@ -88,7 +88,7 @@ public:
   INLINE Orientation getOrientation(void) const;
 };
 
-typedef std::pmap<std::string, SetupItem> SetupType;
+typedef pmap<std::string, SetupItem> SetupType;
 
 extern SetupType* SetupDB;
 
diff --git a/panda/src/chancfg/chanwindow.h b/panda/src/chancfg/chanwindow.h
index bca8e1f799..d43f7f6a24 100644
--- a/panda/src/chancfg/chanwindow.h
+++ b/panda/src/chancfg/chanwindow.h
@@ -53,7 +53,7 @@ public:
   INLINE SetupSyms getSetups(void) const;
 };
 
-typedef std::pmap<std::string, WindowItem> WindowType;
+typedef pmap<std::string, WindowItem> WindowType;
 
 extern WindowType* WindowDB;