From e02d8706f3cb21ee23a618a54471075fa299173a Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 17 Mar 2014 10:12:26 +0000 Subject: [PATCH] Fix EggGroupNode compilation. _ext.cxx sources should not be added to the standard composite files. --- panda/src/egg/Sources.pp | 4 ++-- panda/src/egg/eggGroupNode_ext.cxx | 2 ++ panda/src/egg/p3egg_composite1.cxx | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/panda/src/egg/Sources.pp b/panda/src/egg/Sources.pp index cc68e22b52..ed5b938e4e 100644 --- a/panda/src/egg/Sources.pp +++ b/panda/src/egg/Sources.pp @@ -24,7 +24,7 @@ eggCurve.I eggCurve.h eggData.I eggData.h \ eggExternalReference.I eggExternalReference.h \ eggFilenameNode.I eggFilenameNode.h eggGroup.I eggGroup.h \ - eggGroupNode_ext.h \ + eggGroupNode_ext.cxx eggGroupNode_ext.h \ eggGroupNode.I eggGroupNode.h eggGroupUniquifier.h \ eggLine.I eggLine.h \ eggMaterial.I eggMaterial.h eggMaterialCollection.I \ @@ -71,7 +71,7 @@ eggCoordinateSystem.cxx \ eggCurve.cxx eggData.cxx eggExternalReference.cxx \ eggFilenameNode.cxx eggGroup.cxx \ - eggGroupNode_ext.cxx eggGroupNode.cxx \ + eggGroupNode.cxx \ eggGroupUniquifier.cxx eggLine.cxx eggMaterial.cxx \ eggMaterialCollection.cxx \ eggMesher.cxx \ diff --git a/panda/src/egg/eggGroupNode_ext.cxx b/panda/src/egg/eggGroupNode_ext.cxx index 457ea73ba3..e554bb243c 100644 --- a/panda/src/egg/eggGroupNode_ext.cxx +++ b/panda/src/egg/eggGroupNode_ext.cxx @@ -16,7 +16,9 @@ #ifdef HAVE_PYTHON +#ifndef CPPPARSER IMPORT_THIS struct Dtool_PyTypedObject Dtool_EggNode; +#endif //////////////////////////////////////////////////////////////////// // Function: EggGroupNode::get_children diff --git a/panda/src/egg/p3egg_composite1.cxx b/panda/src/egg/p3egg_composite1.cxx index e0dd93555d..961b702a28 100644 --- a/panda/src/egg/p3egg_composite1.cxx +++ b/panda/src/egg/p3egg_composite1.cxx @@ -13,7 +13,6 @@ #include "eggFilenameNode.cxx" #include "eggGroup.cxx" #include "eggGroupNode.cxx" -#include "eggGroupNode_ext.cxx" #include "eggGroupUniquifier.cxx" #include "eggLine.cxx" #include "eggMaterial.cxx"