From b4eb74c925c2c24dd39a0bfba21e08e44a2925dc Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Tue, 5 Jun 2001 22:56:44 +0000 Subject: [PATCH] use combined srcs --- panda/src/dgraph/Sources.pp | 67 ++++++++++++++------------ panda/src/dgraph/dgraph_composite1.cxx | 10 ++++ panda/src/dgraph/dgraph_composite2.cxx | 14 ++++++ 3 files changed, 61 insertions(+), 30 deletions(-) create mode 100644 panda/src/dgraph/dgraph_composite1.cxx create mode 100644 panda/src/dgraph/dgraph_composite2.cxx diff --git a/panda/src/dgraph/Sources.pp b/panda/src/dgraph/Sources.pp index 63f695af85..8813cd0f6b 100644 --- a/panda/src/dgraph/Sources.pp +++ b/panda/src/dgraph/Sources.pp @@ -6,36 +6,43 @@ #define LOCAL_LIBS \ pstatclient sgraph graph putil sgattrib mathutil + #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx + #define SOURCES \ - buttonEventDataAttribute.I buttonEventDataAttribute.cxx \ - buttonEventDataAttribute.h buttonEventDataTransition.I \ - buttonEventDataTransition.cxx buttonEventDataTransition.h \ - config_dgraph.cxx config_dgraph.h dataGraphTraversal.cxx \ - dataGraphTraversal.h dataGraphTraverser.I dataGraphTraverser.cxx \ - dataGraphTraverser.h dataNode.cxx dataNode.h dataRelation.I \ - dataRelation.N dataRelation.cxx dataRelation.h \ - describe_data_verbose.cxx describe_data_verbose.h \ - doubleDataAttribute.I doubleDataAttribute.cxx \ - doubleDataAttribute.h doubleDataTransition.I \ - doubleDataTransition.cxx doubleDataTransition.h \ - doublePtrDataAttribute.I doublePtrDataAttribute.cxx \ - doublePtrDataAttribute.h doublePtrDataTransition.I \ - doublePtrDataTransition.cxx doublePtrDataTransition.h \ - intDataAttribute.I intDataAttribute.cxx intDataAttribute.h \ - intDataTransition.I intDataTransition.cxx intDataTransition.h \ - matrixDataAttribute.I matrixDataAttribute.cxx \ - matrixDataAttribute.h matrixDataTransition.I \ - matrixDataTransition.cxx matrixDataTransition.h \ - numericDataAttribute.I numericDataAttribute.h \ - numericDataTransition.I numericDataTransition.h \ - pointerDataAttribute.I pointerDataAttribute.h \ - pointerDataTransition.I pointerDataTransition.h \ - vec3DataAttribute.I vec3DataAttribute.cxx vec3DataAttribute.h \ - vec3DataTransition.I vec3DataTransition.cxx vec3DataTransition.h \ - vec4DataAttribute.I vec4DataAttribute.cxx vec4DataAttribute.h \ - vec4DataTransition.I vec4DataTransition.cxx vec4DataTransition.h \ - vectorDataAttribute.I vectorDataAttribute.h vectorDataTransition.I \ - vectorDataTransition.h + buttonEventDataAttribute.I buttonEventDataAttribute.h \ + buttonEventDataTransition.I buttonEventDataTransition.h \ + config_dgraph.h dataGraphTraversal.h dataGraphTraverser.I \ + dataGraphTraverser.h dataNode.h dataRelation.I \ + dataRelation.N dataRelation.h describe_data_verbose.h \ + doubleDataAttribute.I doubleDataAttribute.h \ + doubleDataTransition.I doubleDataTransition.h \ + doublePtrDataAttribute.I doublePtrDataAttribute.h \ + doublePtrDataTransition.I doublePtrDataTransition.h \ + intDataAttribute.I intDataAttribute.h intDataTransition.I \ + intDataTransition.h matrixDataAttribute.I \ + matrixDataAttribute.h matrixDataTransition.I \ + matrixDataTransition.h numericDataAttribute.I \ + numericDataAttribute.h numericDataTransition.I \ + numericDataTransition.h pointerDataAttribute.I \ + pointerDataAttribute.h pointerDataTransition.I \ + pointerDataTransition.h vec3DataAttribute.I \ + vec3DataAttribute.h vec3DataTransition.I \ + vec3DataTransition.h vec4DataAttribute.I vec4DataAttribute.h \ + vec4DataTransition.I vec4DataTransition.h \ + vectorDataAttribute.I vectorDataAttribute.h \ + vectorDataTransition.I vectorDataTransition.h + + #define INCLUDED_SOURCES \ + buttonEventDataAttribute.cxx buttonEventDataTransition.cxx \ + config_dgraph.cxx dataGraphTraversal.cxx \ + dataGraphTraverser.cxx dataNode.cxx dataRelation.cxx \ + describe_data_verbose.cxx doubleDataAttribute.cxx \ + doubleDataTransition.cxx doublePtrDataAttribute.cxx \ + doublePtrDataTransition.cxx intDataAttribute.cxx \ + intDataTransition.cxx matrixDataAttribute.cxx \ + matrixDataTransition.cxx vec3DataAttribute.cxx \ + vec3DataTransition.cxx vec4DataAttribute.cxx \ + vec4DataTransition.cxx #define INSTALL_HEADERS \ buttonEventDataAttribute.I buttonEventDataAttribute.h \ @@ -58,7 +65,7 @@ vec4DataTransition.h vectorDataAttribute.I vectorDataAttribute.h \ vectorDataTransition.I vectorDataTransition.h - #define PRECOMPILED_HEADER dgraph_headers.h +// #define PRECOMPILED_HEADER dgraph_headers.h #define IGATESCAN \ dataNode.cxx dataNode.h dataRelation.cxx dataRelation.h \ diff --git a/panda/src/dgraph/dgraph_composite1.cxx b/panda/src/dgraph/dgraph_composite1.cxx new file mode 100644 index 0000000000..e010f5c642 --- /dev/null +++ b/panda/src/dgraph/dgraph_composite1.cxx @@ -0,0 +1,10 @@ + +#include "buttonEventDataAttribute.cxx" +#include "buttonEventDataTransition.cxx" +#include "config_dgraph.cxx" +#include "matrixDataAttribute.cxx" +#include "matrixDataTransition.cxx" +#include "vec3DataAttribute.cxx" +#include "vec3DataTransition.cxx" +#include "vec4DataAttribute.cxx" +#include "vec4DataTransition.cxx" diff --git a/panda/src/dgraph/dgraph_composite2.cxx b/panda/src/dgraph/dgraph_composite2.cxx new file mode 100644 index 0000000000..be92a5389b --- /dev/null +++ b/panda/src/dgraph/dgraph_composite2.cxx @@ -0,0 +1,14 @@ + +#include "dataGraphTraversal.cxx" +#include "dataGraphTraverser.cxx" +#include "dataNode.cxx" +#include "dataRelation.cxx" +#include "describe_data_verbose.cxx" +#include "doubleDataAttribute.cxx" +#include "doubleDataTransition.cxx" +#include "doublePtrDataAttribute.cxx" +#include "doublePtrDataTransition.cxx" +#include "intDataAttribute.cxx" +#include "intDataTransition.cxx" + +