general: Fix up include structure to resolve errors when building without composites.

dtool/src/dtoolutil/filename.cxx

@@ -49,6 +49,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_PYTHON
+#include "Python.h"
+#endif
+
 TextEncoder::Encoding Filename::_filesystem_encoding = TextEncoder::E_utf8;
 
 TVOLATILE AtomicAdjust::Pointer Filename::_home_directory;

dtool/src/dtoolutil/globPattern.cxx

@@ -15,6 +15,10 @@
 #include "globPattern.h"
 #include <ctype.h>
 
+#ifdef HAVE_PYTHON
+#include "Python.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GlobPattern::has_glob_characters
 //       Access: Published

panda/src/audiotraits/fmodAudioManager.cxx

@@ -17,6 +17,7 @@
 
 #include "pandabase.h"
 #include "config_audio.h"
+#include "config_fmodAudio.h"
 #include "dcast.h"
 
 #ifdef HAVE_FMODEX //[

panda/src/audiotraits/fmodAudioSound.cxx

@@ -23,10 +23,12 @@
 
 //Panda Headers
 #include "config_audio.h"
+#include "config_fmodAudio.h"
 #include "fmodAudioSound.h"
 #include "string_utils.h"
 #include "subfileInfo.h"
 #include "reMutexHolder.h"
+#include "virtualFileSystem.h"
 
 TypeHandle FmodAudioSound::_type_handle;
 

panda/src/audiotraits/fmodAudioSound.h

@@ -77,6 +77,7 @@
 
 #include "audioSound.h"
 #include "reMutex.h"
+#include "fmodAudioManager.h"
 
 #include <fmod.hpp>
 #include <fmod_errors.h>

panda/src/audiotraits/openalAudioSound.h

@@ -25,6 +25,7 @@
 #include "audioSound.h"
 #include "movieAudioCursor.h"
 #include "trueClock.h"
+#include "openalAudioManager.h"
 
 // OSX uses the OpenAL framework
 #ifdef IS_OSX

panda/src/egg/eggGroupNode.cxx

@@ -13,11 +13,13 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "eggGroupNode.h"
+#include "eggGroup.h"
 #include "eggCoordinateSystem.h"
 #include "eggData.h"
 #include "eggFilenameNode.h"
 #include "eggExternalReference.h"
 #include "eggPrimitive.h"
+#include "eggPoint.h"
 #include "eggPolygon.h"
 #include "eggCompositePrimitive.h"
 #include "eggMesher.h"
@@ -30,6 +32,7 @@
 #include "config_egg.h"
 
 #include "dSearchPath.h"
+#include "virtualFileSystem.h"
 #include "deg_2_rad.h"
 #include "dcast.h"
 #include "bamCacheRecord.h"

panda/src/egg/eggNode.cxx

@@ -14,6 +14,7 @@
 
 #include "eggNode.h"
 #include "eggGroupNode.h"
+#include "lightMutexHolder.h"
 #include "config_egg.h"
 #include "eggTextureCollection.h"
 #include "dcast.h"

panda/src/egg/eggParameters.h

@@ -17,6 +17,8 @@
 
 #include "pandabase.h"
 
+#include "numeric_types.h"
+
 ////////////////////////////////////////////////////////////////////
 //       Class : EggParameters
 // Description : The values stored in this structure are global

panda/src/egg2pg/eggSaver.h

@@ -18,6 +18,7 @@
 #include "pandabase.h"
 
 #include "luse.h"
+#include "eggData.h"
 #include "eggTextureCollection.h"
 #include "eggMaterialCollection.h"
 

panda/src/ffmpeg/config_ffmpeg.h

@@ -26,6 +26,13 @@
 ConfigureDecl(config_ffmpeg, EXPCL_FFMPEG, EXPTP_FFMPEG);
 NotifyCategoryDecl(ffmpeg, EXPCL_FFMPEG, EXPTP_FFMPEG);
 
+extern ConfigVariableInt ffmpeg_max_readahead_frames;
+extern ConfigVariableBool ffmpeg_show_seek_frames;
+extern ConfigVariableBool ffmpeg_support_seek;
+extern ConfigVariableBool ffmpeg_global_lock;
+extern ConfigVariableEnum<ThreadPriority> ffmpeg_thread_priority;
+extern ConfigVariableInt ffmpeg_read_buffer_size;
+
 extern EXPCL_FFMPEG void init_libffmpeg();
 
 #endif /* CONFIG_FFMPEG_H */

panda/src/ffmpeg/ffmpegAudio.cxx

@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "config_ffmpeg.h"
 #include "ffmpegAudio.h"
 #include "ffmpegAudioCursor.h"
 #include "dcast.h"

panda/src/ffmpeg/ffmpegAudioCursor.cxx

@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "config_ffmpeg.h"
 #include "ffmpegAudioCursor.h"
 
 #include "ffmpegAudio.h"

panda/src/ffmpeg/ffmpegVideo.cxx

@@ -14,7 +14,7 @@
 
 #include "ffmpegVideo.h"
 #include "ffmpegVideoCursor.h"
-#include "config_movies.h"
+#include "config_ffmpeg.h"
 #include "bamReader.h"
 #include "dcast.h"
 

panda/src/ffmpeg/ffmpegVideoCursor.cxx

@@ -13,7 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "ffmpegVideoCursor.h"
-#include "config_movies.h"
+#include "config_ffmpeg.h"
 #include "pStatCollector.h"
 #include "pStatTimer.h"
 #include "mutexHolder.h"

panda/src/ffmpeg/ffmpegVirtualFile.cxx

@@ -14,7 +14,7 @@
 
 #include "pandabase.h"
 
-#include "config_movies.h"
+#include "config_ffmpeg.h"
 #include "ffmpegVirtualFile.h"
 #include "virtualFileSystem.h"
 

panda/src/gobj/geomPrimitive.cxx

@@ -14,6 +14,7 @@
 
 #include "geomPrimitive.h"
 #include "geom.h"
+#include "geomPatches.h"
 #include "geomVertexData.h"
 #include "geomVertexArrayFormat.h"
 #include "geomVertexColumn.h"

panda/src/gobj/shader.h

@@ -21,6 +21,7 @@
 #include "namable.h"
 #include "graphicsStateGuardianBase.h"
 #include "internalName.h"
+#include "pta_int.h"
 #include "pta_float.h"
 #include "pta_double.h"
 #include "pta_stdfloat.h"

panda/src/movies/movieTypeRegistry.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "movieTypeRegistry.h"
+#include "string_utils.h"
 #include "config_movies.h"
 #include "config_util.h"
 #include "load_dso.h"

panda/src/movies/wavAudioCursor.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "wavAudioCursor.h"
+#include "config_movies.h"
 #include "virtualFileSystem.h"
 
 // Tables for decompressing mu-law and A-law wav files.

panda/src/movies/wavAudioCursor.h

@@ -19,7 +19,7 @@
 #include "movieAudioCursor.h"
 #include "streamReader.h"
 
-class WavAudio;
+#include "wavAudio.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : WavAudioCursor

panda/src/nativenet/socket_tcp_listen.h

@@ -3,6 +3,7 @@
 
 #include "pandabase.h"
 #include "socket_ip.h"
+#include "socket_tcp.h"
 
 /////////////////////////////////////////////////////////////////////
 // Class : Socket_TCP_Listen

panda/src/nativenet/socket_tcp_ssl.h

@@ -2,6 +2,7 @@
 #define __SOCKET_TCP_SSL_H__ 
 
 #include "pandabase.h"
+#include "config_nativenet.h"
 #include "socket_ip.h"
 #include "numeric_types.h"
 

panda/src/nativenet/socket_udp_outgoing.h

@@ -1,6 +1,9 @@
 #ifndef __SOCKET_UDP_OUTGOING_H__
 #define __SOCKET_UDP_OUTGOING_H__
 
+#include "config_nativenet.h"
+#include "socket_ip.h"
+
 /////////////////////////////////////////////////////////////////////
 // Class : Socket_UDP_Outgoing
 //

panda/src/net/connectionListener.cxx

@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "dcast.h"
 #include "connectionListener.h"
 #include "connection.h"
 #include "connectionManager.h"

panda/src/net/connectionManager.cxx

@@ -18,6 +18,8 @@
 #include "connectionWriter.h"
 #include "netAddress.h"
 #include "config_net.h"
+#include "socket_udp.h"
+#include "socket_tcp_listen.h"
 #include "lightMutexHolder.h"
 #include "trueClock.h"
 

panda/src/net/connectionReader.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "connectionReader.h"
+#include "dcast.h"
 #include "connectionManager.h"
 #include "netDatagram.h"
 #include "datagramTCPHeader.h"

panda/src/net/datagramGeneratorNet.h

@@ -22,6 +22,7 @@
 #include "queuedReturn.h"
 #include "pmutex.h"
 #include "conditionVar.h"
+#include "netDatagram.h"
 
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_NET, EXPTP_PANDA_NET, QueuedReturn<Datagram>);
 

panda/src/ode/odeBody.cxx

@@ -14,6 +14,7 @@
 
 #include "config_ode.h"
 #include "odeBody.h"
+#include "odeJoint.h"
 
 TypeHandle OdeBody::_type_handle;
 

panda/src/ode/odeGeom.cxx

@@ -14,6 +14,18 @@
 
 #include "config_ode.h"
 #include "odeGeom.h"
+#include "odeSimpleSpace.h"
+#include "odeQuadTreeSpace.h"
+#include "odeHashSpace.h"
+
+#include "odeTriMeshGeom.h"
+#include "odeTriMeshData.h"
+#include "odeBoxGeom.h"
+#include "odeCappedCylinderGeom.h"
+#include "odeCylinderGeom.h"
+#include "odePlaneGeom.h"
+#include "odeRayGeom.h"
+#include "odeSphereGeom.h"
 
 //OdeGeom::GeomSurfaceMap OdeGeom::_geom_surface_map;
 //OdeGeom::GeomCollideIdMap OdeGeom::_geom_collide_id_map;

panda/src/ode/odeJoint.cxx

@@ -14,6 +14,18 @@
 
 #include "config_ode.h"
 #include "odeJoint.h"
+#include "odeBallJoint.h"
+#include "odeHingeJoint.h"
+#include "odeHinge2Joint.h"
+#include "odeSliderJoint.h"
+#include "odeContactJoint.h"
+#include "odeUniversalJoint.h"
+#include "odeFixedJoint.h"
+#include "odeNullJoint.h"
+#include "odePlane2dJoint.h"
+#include "odeAMotorJoint.h"
+#include "odeLMotorJoint.h"
+#include "odeBody.h"
 
 TypeHandle OdeJoint::_type_handle;
 

panda/src/ode/odeSpace.cxx

@@ -14,6 +14,11 @@
 
 #include "config_ode.h"
 #include "odeSpace.h"
+#include "odeGeom.h"
+#include "odeCollisionEntry.h"
+#include "odeSimpleSpace.h"
+#include "odeQuadTreeSpace.h"
+#include "odeHashSpace.h"
 
 #include "throw_event.h"
 

panda/src/ode/odeWorld.cxx

@@ -14,6 +14,7 @@
 
 #include "config_ode.h"
 #include "odeWorld.h"
+#include "odeBody.h"
 
 TypeHandle OdeWorld::_type_handle;
 

panda/src/pgraphnodes/computeNode.h

@@ -18,6 +18,7 @@
 #include "pandabase.h"
 #include "pandaNode.h"
 #include "callbackObject.h"
+#include "callbackNode.h"
 #include "pointerTo.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/pipeline/lightMutexDirect.h

@@ -17,6 +17,7 @@
 
 #include "pandabase.h"
 #include "mutexImpl.h"
+#include "mutexTrueImpl.h"
 #include "pnotify.h"
 
 class Thread;

panda/src/putil/buttonMap.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "buttonMap.h"
+#include "indent.h"
 
 TypeHandle ButtonMap::_type_handle;