Browse Source

Fix EggGroupNode compilation. _ext.cxx sources should not be added to the standard composite files.

rdb 11 years ago
parent
commit
e02d8706f3

+ 2 - 2
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 \

+ 2 - 0
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

+ 0 - 1
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"