RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use combined srcs

This commit is contained in:
cxgeorge 2001-06-06 02:47:17 +00:00
parent 52c20f043e
commit 4f90af14ab
9 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/chancfg/Sources.pp
View File

@ -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

2
panda/src/chancfg/chancfg.cxx
View File

@ -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())

2
panda/src/chancfg/chancfg.h
View File

@ -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);

6
panda/src/chancfg/chancfg_composite1.cxx Normal file
View File

@ -0,0 +1,6 @@
#include "chancfg.cxx"
#include "chanlayout.cxx"
#include "chanparse.cxx"

5
panda/src/chancfg/chancfg_composite2.cxx Normal file
View File

@ -0,0 +1,5 @@
#include "chansetup.cxx"
#include "chanwindow.cxx"

2
panda/src/chancfg/chanlayout.cxx
View File

@ -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;

4
panda/src/chancfg/chanlayout.h
View File

@ -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;

2
panda/src/chancfg/chansetup.h
View File

@ -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;

2
panda/src/chancfg/chanwindow.h
View File

@ -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;