From c3f99505321e2698ee41f8f725fe340cb3cbfd40 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Wed, 6 Jun 2001 02:14:00 +0000 Subject: [PATCH] use combined srcs --- panda/src/device/Sources.pp | 32 +++++++++++++++----------- panda/src/device/device_composite1.cxx | 8 +++++++ panda/src/device/device_composite2.cxx | 9 ++++++++ 3 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 panda/src/device/device_composite1.cxx create mode 100644 panda/src/device/device_composite2.cxx diff --git a/panda/src/device/Sources.pp b/panda/src/device/Sources.pp index 99cc4445a9..d138c2ac82 100644 --- a/panda/src/device/Sources.pp +++ b/panda/src/device/Sources.pp @@ -6,20 +6,24 @@ #define LOCAL_LIBS \ dgraph display gobj sgraph graph gsgbase ipc mathutil linmath putil + #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx + #define SOURCES \ - analogNode.I analogNode.cxx analogNode.h \ - buttonNode.I buttonNode.h buttonNode.cxx \ - clientAnalogDevice.I clientAnalogDevice.cxx clientAnalogDevice.h \ - clientBase.I clientBase.cxx clientBase.h \ - clientButtonDevice.I clientButtonDevice.cxx clientButtonDevice.h \ - clientDevice.I clientDevice.cxx clientDevice.h \ - clientDialDevice.I clientDialDevice.cxx clientDialDevice.h \ - clientTrackerDevice.I clientTrackerDevice.cxx clientTrackerDevice.h \ - config_device.cxx config_device.h \ - dialNode.I dialNode.h dialNode.cxx \ - mouse.cxx mouse.h \ - trackerData.I trackerData.cxx trackerData.h \ - trackerNode.I trackerNode.cxx trackerNode.h + analogNode.I analogNode.h buttonNode.I buttonNode.h \ + clientAnalogDevice.I clientAnalogDevice.h clientBase.I \ + clientBase.h clientButtonDevice.I clientButtonDevice.h \ + clientDevice.I clientDevice.h clientDialDevice.I \ + clientDialDevice.h clientTrackerDevice.I \ + clientTrackerDevice.h config_device.h dialNode.I dialNode.h \ + mouse.h trackerData.I trackerData.h trackerNode.I \ + trackerNode.h + + #define INCLUDED_SOURCES \ + analogNode.cxx buttonNode.cxx clientAnalogDevice.cxx \ + clientBase.cxx clientButtonDevice.cxx clientDevice.cxx \ + clientDialDevice.cxx clientTrackerDevice.cxx \ + config_device.cxx dialNode.cxx mouse.cxx trackerData.cxx \ + trackerNode.cxx #define INSTALL_HEADERS \ analogNode.I analogNode.h \ @@ -35,7 +39,7 @@ trackerData.I trackerData.h \ trackerNode.I trackerNode.h - #define PRECOMPILED_HEADER device_headers.h +// #define PRECOMPILED_HEADER device_headers.h #define IGATESCAN all diff --git a/panda/src/device/device_composite1.cxx b/panda/src/device/device_composite1.cxx new file mode 100644 index 0000000000..b48fae48ec --- /dev/null +++ b/panda/src/device/device_composite1.cxx @@ -0,0 +1,8 @@ + +#include "clientAnalogDevice.cxx" +#include "clientBase.cxx" +#include "clientButtonDevice.cxx" +#include "clientDevice.cxx" +#include "clientDialDevice.cxx" +#include "clientTrackerDevice.cxx" + diff --git a/panda/src/device/device_composite2.cxx b/panda/src/device/device_composite2.cxx new file mode 100644 index 0000000000..0f6f095a67 --- /dev/null +++ b/panda/src/device/device_composite2.cxx @@ -0,0 +1,9 @@ + +#include "config_device.cxx" +#include "analogNode.cxx" +#include "buttonNode.cxx" +#include "dialNode.cxx" +#include "mouse.cxx" +#include "trackerData.cxx" +#include "trackerNode.cxx" +