Explorar el Código

fix missing includes

David Rose hace 21 años
padre
commit
925a3d0978

+ 4 - 0
direct/src/dcparser/Sources.pp

@@ -27,6 +27,7 @@
      dcParameter.h dcClassParameter.h dcArrayParameter.h dcSimpleParameter.h \
      dcNumericRange.h dcNumericRange.I \
      dcTypedef.h \
+     dcPython.h \
      dcbase.h dcindent.h hashGenerator.h  \
      primeNumberGenerator.h  
 
@@ -45,5 +46,8 @@
      dcindent.cxx  \
      hashGenerator.cxx primeNumberGenerator.cxx 
 
+  //  #define SOURCES $[SOURCES] $[INCLUDED_SOURCES]
+  //  #define COMBINED_SOURCES
+
   #define IGATESCAN all
 #end lib_target

+ 1 - 0
direct/src/dcparser/dcClass.cxx

@@ -17,6 +17,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "dcClass.h"
+#include "dcAtomicField.h"
 #include "dcParameter.h"
 #include "hashGenerator.h"
 #include "dcindent.h"

+ 1 - 0
direct/src/dcparser/dcClass.h

@@ -22,6 +22,7 @@
 #include "dcbase.h"
 #include "dcField.h"
 #include "dcDeclaration.h"
+#include "dcPython.h"
 
 class HashGenerator;
 class DCParameter;

+ 1 - 11
direct/src/dcparser/dcField.h

@@ -21,17 +21,7 @@
 
 #include "dcbase.h"
 #include "dcPackerInterface.h"
-
-#ifdef HAVE_PYTHON
-
-#undef HAVE_LONG_LONG  // NSPR and Python both define this.
-#include <Python.h>
-
-// We only need these headers if we are also building a Python interface.
-#include "datagram.h"
-#include "datagramIterator.h"
-
-#endif  // HAVE_PYTHON
+#include "dcPython.h"
 
 class DCAtomicField;
 class DCMolecularField;

+ 1 - 0
direct/src/dcparser/dcMolecularField.h

@@ -23,6 +23,7 @@
 #include "dcField.h"
 
 class DCAtomicField;
+class DCParameter;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : DCMolecularField

+ 1 - 0
direct/src/dcparser/dcPacker.h

@@ -24,6 +24,7 @@
 #include "dcSubatomicType.h"
 #include "dcPackData.h"
 #include "dcPackerCatalog.h"
+#include "dcPython.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : DCPacker

+ 37 - 0
direct/src/dcparser/dcPython.h

@@ -0,0 +1,37 @@
+// Filename: dcPython.h
+// Created by:  drose (22Jun04)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+#ifndef DCPYTHON_H
+#define DCPYTHON_H
+
+// The only purpose of this file is to serve as a common place to put
+// the nonsense associated with #including <Python.h>.
+
+#ifdef HAVE_PYTHON
+
+#undef HAVE_LONG_LONG  // NSPR and Python both define this.
+#include <Python.h>
+
+// Several interfaces in this module that use Python also require
+// these header files, so we might as well pick them up too.
+#include "datagram.h"
+#include "datagramIterator.h"
+
+#endif  // HAVE_PYTHON
+
+#endif

+ 2 - 2
direct/src/dcparser/dcTypedef.cxx

@@ -16,9 +16,9 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "dcTypedef.h"
 #include "dcParameter.h"
-#include "hashGenerator.h"
-#include "dcParameter.h"
+#include "dcSimpleParameter.h"
 #include "dcindent.h"
 
 ////////////////////////////////////////////////////////////////////