From 52c20f043e9ec0859cf258ee93acbcee78a35f27 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Wed, 6 Jun 2001 02:31:58 +0000 Subject: [PATCH] use combined srcs --- panda/src/mathutil/Sources.pp | 31 +++++++++++++--------- panda/src/mathutil/mathutil_composite1.cxx | 9 +++++++ panda/src/mathutil/mathutil_composite2.cxx | 7 +++++ 3 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 panda/src/mathutil/mathutil_composite1.cxx create mode 100644 panda/src/mathutil/mathutil_composite2.cxx diff --git a/panda/src/mathutil/Sources.pp b/panda/src/mathutil/Sources.pp index c66a41ef43..c47bfd5831 100644 --- a/panda/src/mathutil/Sources.pp +++ b/panda/src/mathutil/Sources.pp @@ -8,19 +8,24 @@ #define USE_FFTW yes #define UNIX_SYS_LIBS m - #define SOURCES \ - boundingHexahedron.I boundingHexahedron.cxx boundingHexahedron.h \ - boundingLine.I boundingLine.cxx boundingLine.h boundingSphere.I \ - boundingSphere.cxx boundingSphere.h boundingVolume.I \ - boundingVolume.cxx boundingVolume.h config_mathutil.cxx \ - config_mathutil.h fftCompressor.cxx fftCompressor.h \ - finiteBoundingVolume.cxx finiteBoundingVolume.h frustum.h \ - frustum_src.I frustum_src.h geometricBoundingVolume.I \ - geometricBoundingVolume.cxx geometricBoundingVolume.h look_at.cxx \ - look_at.h look_at_src.I look_at_src.cxx look_at_src.h \ - omniBoundingVolume.I omniBoundingVolume.cxx omniBoundingVolume.h \ - plane.cxx plane.h plane_src.I plane_src.cxx plane_src.h \ - rotate_to.cxx rotate_to.h rotate_to_src.cxx + #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx + + #define SOURCES \ + boundingHexahedron.I boundingHexahedron.h boundingLine.I \ + boundingLine.h boundingSphere.I boundingSphere.h \ + boundingVolume.I boundingVolume.h config_mathutil.h \ + fftCompressor.h finiteBoundingVolume.h frustum.h \ + frustum_src.I frustum_src.h geometricBoundingVolume.I \ + geometricBoundingVolume.h look_at.h look_at_src.I \ + look_at_src.cxx look_at_src.h omniBoundingVolume.I \ + omniBoundingVolume.h plane.h plane_src.I plane_src.cxx \ + plane_src.h rotate_to.h rotate_to_src.cxx + + #define INCLUDED_SOURCES \ + boundingHexahedron.cxx boundingLine.cxx boundingSphere.cxx \ + boundingVolume.cxx config_mathutil.cxx fftCompressor.cxx \ + finiteBoundingVolume.cxx geometricBoundingVolume.cxx \ + look_at.cxx omniBoundingVolume.cxx plane.cxx rotate_to.cxx #define INSTALL_HEADERS \ boundingHexahedron.I boundingHexahedron.h boundingLine.I \ diff --git a/panda/src/mathutil/mathutil_composite1.cxx b/panda/src/mathutil/mathutil_composite1.cxx new file mode 100644 index 0000000000..7092a5658e --- /dev/null +++ b/panda/src/mathutil/mathutil_composite1.cxx @@ -0,0 +1,9 @@ + +#include "boundingVolume.cxx" +#include "boundingHexahedron.cxx" +#include "boundingLine.cxx" +#include "boundingSphere.cxx" +#include "finiteBoundingVolume.cxx" +#include "geometricBoundingVolume.cxx" +#include "omniBoundingVolume.cxx" + diff --git a/panda/src/mathutil/mathutil_composite2.cxx b/panda/src/mathutil/mathutil_composite2.cxx new file mode 100644 index 0000000000..9f039ff89f --- /dev/null +++ b/panda/src/mathutil/mathutil_composite2.cxx @@ -0,0 +1,7 @@ + +#include "config_mathutil.cxx" +#include "plane.cxx" +#include "rotate_to.cxx" +#include "look_at.cxx" +#include "fftCompressor.cxx" +