From cf1a9f180722cc12e95f747582a8e1863db99eeb Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sat, 26 Jul 2014 15:09:11 -0700 Subject: [PATCH] general: Fix up include structure to resolve errors when building without composites. --- dtool/src/dtoolutil/filename.cxx | 4 ++++ dtool/src/dtoolutil/globPattern.cxx | 4 ++++ panda/src/audiotraits/fmodAudioManager.cxx | 1 + panda/src/audiotraits/fmodAudioSound.cxx | 2 ++ panda/src/audiotraits/fmodAudioSound.h | 1 + panda/src/audiotraits/openalAudioSound.h | 1 + panda/src/egg/eggGroupNode.cxx | 3 +++ panda/src/egg/eggNode.cxx | 1 + panda/src/egg/eggParameters.h | 2 ++ panda/src/egg2pg/eggSaver.h | 1 + panda/src/ffmpeg/config_ffmpeg.h | 7 +++++++ panda/src/ffmpeg/ffmpegAudio.cxx | 1 + panda/src/ffmpeg/ffmpegAudioCursor.cxx | 1 + panda/src/ffmpeg/ffmpegVideo.cxx | 2 +- panda/src/ffmpeg/ffmpegVideoCursor.cxx | 2 +- panda/src/ffmpeg/ffmpegVirtualFile.cxx | 2 +- panda/src/gobj/geomPrimitive.cxx | 1 + panda/src/gobj/shader.h | 1 + panda/src/movies/movieTypeRegistry.cxx | 1 + panda/src/movies/wavAudioCursor.cxx | 1 + panda/src/movies/wavAudioCursor.h | 2 +- panda/src/nativenet/socket_tcp_listen.h | 1 + panda/src/nativenet/socket_tcp_ssl.h | 1 + panda/src/nativenet/socket_udp_outgoing.h | 3 +++ panda/src/net/connectionListener.cxx | 1 + panda/src/net/connectionManager.cxx | 2 ++ panda/src/net/connectionReader.cxx | 1 + panda/src/net/datagramGeneratorNet.h | 1 + panda/src/ode/odeBody.cxx | 1 + panda/src/ode/odeGeom.cxx | 12 ++++++++++++ panda/src/ode/odeJoint.cxx | 12 ++++++++++++ panda/src/ode/odeSpace.cxx | 5 +++++ panda/src/ode/odeWorld.cxx | 1 + panda/src/pgraphnodes/computeNode.h | 1 + panda/src/pipeline/lightMutexDirect.h | 1 + panda/src/putil/buttonMap.cxx | 1 + 36 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dtool/src/dtoolutil/filename.cxx b/dtool/src/dtoolutil/filename.cxx index b7d7c51e53..73e796b8c0 100644 --- a/dtool/src/dtoolutil/filename.cxx +++ b/dtool/src/dtoolutil/filename.cxx @@ -49,6 +49,10 @@ #include #endif +#ifdef HAVE_PYTHON +#include "Python.h" +#endif + TextEncoder::Encoding Filename::_filesystem_encoding = TextEncoder::E_utf8; TVOLATILE AtomicAdjust::Pointer Filename::_home_directory; diff --git a/dtool/src/dtoolutil/globPattern.cxx b/dtool/src/dtoolutil/globPattern.cxx index 4260625139..5db2ee9df2 100644 --- a/dtool/src/dtoolutil/globPattern.cxx +++ b/dtool/src/dtoolutil/globPattern.cxx @@ -15,6 +15,10 @@ #include "globPattern.h" #include +#ifdef HAVE_PYTHON +#include "Python.h" +#endif + //////////////////////////////////////////////////////////////////// // Function: GlobPattern::has_glob_characters // Access: Published diff --git a/panda/src/audiotraits/fmodAudioManager.cxx b/panda/src/audiotraits/fmodAudioManager.cxx index 13420c56fa..f5c190689a 100644 --- a/panda/src/audiotraits/fmodAudioManager.cxx +++ b/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 //[ diff --git a/panda/src/audiotraits/fmodAudioSound.cxx b/panda/src/audiotraits/fmodAudioSound.cxx index ff1fe1309e..7eb0fd269f 100644 --- a/panda/src/audiotraits/fmodAudioSound.cxx +++ b/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; diff --git a/panda/src/audiotraits/fmodAudioSound.h b/panda/src/audiotraits/fmodAudioSound.h index 436ad2c6c1..46aac1c2a3 100644 --- a/panda/src/audiotraits/fmodAudioSound.h +++ b/panda/src/audiotraits/fmodAudioSound.h @@ -77,6 +77,7 @@ #include "audioSound.h" #include "reMutex.h" +#include "fmodAudioManager.h" #include #include diff --git a/panda/src/audiotraits/openalAudioSound.h b/panda/src/audiotraits/openalAudioSound.h index 3d04677ec3..5922e0d49b 100644 --- a/panda/src/audiotraits/openalAudioSound.h +++ b/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 diff --git a/panda/src/egg/eggGroupNode.cxx b/panda/src/egg/eggGroupNode.cxx index 13da740b27..93a77db7bd 100644 --- a/panda/src/egg/eggGroupNode.cxx +++ b/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" diff --git a/panda/src/egg/eggNode.cxx b/panda/src/egg/eggNode.cxx index d93d510081..4077561239 100644 --- a/panda/src/egg/eggNode.cxx +++ b/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" diff --git a/panda/src/egg/eggParameters.h b/panda/src/egg/eggParameters.h index b813fd684b..56ba5799a1 100644 --- a/panda/src/egg/eggParameters.h +++ b/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 diff --git a/panda/src/egg2pg/eggSaver.h b/panda/src/egg2pg/eggSaver.h index 2cd5064cf4..c565b258af 100755 --- a/panda/src/egg2pg/eggSaver.h +++ b/panda/src/egg2pg/eggSaver.h @@ -18,6 +18,7 @@ #include "pandabase.h" #include "luse.h" +#include "eggData.h" #include "eggTextureCollection.h" #include "eggMaterialCollection.h" diff --git a/panda/src/ffmpeg/config_ffmpeg.h b/panda/src/ffmpeg/config_ffmpeg.h index 76527c7f38..85d0c28696 100644 --- a/panda/src/ffmpeg/config_ffmpeg.h +++ b/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 ffmpeg_thread_priority; +extern ConfigVariableInt ffmpeg_read_buffer_size; + extern EXPCL_FFMPEG void init_libffmpeg(); #endif /* CONFIG_FFMPEG_H */ diff --git a/panda/src/ffmpeg/ffmpegAudio.cxx b/panda/src/ffmpeg/ffmpegAudio.cxx index 3f2c751673..86a69622f9 100644 --- a/panda/src/ffmpeg/ffmpegAudio.cxx +++ b/panda/src/ffmpeg/ffmpegAudio.cxx @@ -12,6 +12,7 @@ // //////////////////////////////////////////////////////////////////// +#include "config_ffmpeg.h" #include "ffmpegAudio.h" #include "ffmpegAudioCursor.h" #include "dcast.h" diff --git a/panda/src/ffmpeg/ffmpegAudioCursor.cxx b/panda/src/ffmpeg/ffmpegAudioCursor.cxx index 7269209763..5cddb016c8 100644 --- a/panda/src/ffmpeg/ffmpegAudioCursor.cxx +++ b/panda/src/ffmpeg/ffmpegAudioCursor.cxx @@ -12,6 +12,7 @@ // //////////////////////////////////////////////////////////////////// +#include "config_ffmpeg.h" #include "ffmpegAudioCursor.h" #include "ffmpegAudio.h" diff --git a/panda/src/ffmpeg/ffmpegVideo.cxx b/panda/src/ffmpeg/ffmpegVideo.cxx index 2c35ce5658..c7756c435d 100644 --- a/panda/src/ffmpeg/ffmpegVideo.cxx +++ b/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" diff --git a/panda/src/ffmpeg/ffmpegVideoCursor.cxx b/panda/src/ffmpeg/ffmpegVideoCursor.cxx index 221987ae8e..a02dac184b 100644 --- a/panda/src/ffmpeg/ffmpegVideoCursor.cxx +++ b/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" diff --git a/panda/src/ffmpeg/ffmpegVirtualFile.cxx b/panda/src/ffmpeg/ffmpegVirtualFile.cxx index 8b459384a2..5d0affbfcd 100644 --- a/panda/src/ffmpeg/ffmpegVirtualFile.cxx +++ b/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" diff --git a/panda/src/gobj/geomPrimitive.cxx b/panda/src/gobj/geomPrimitive.cxx index 86d07499d0..90891fe0c1 100644 --- a/panda/src/gobj/geomPrimitive.cxx +++ b/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" diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h index 04ae46ffc2..7ecf2efb07 100755 --- a/panda/src/gobj/shader.h +++ b/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" diff --git a/panda/src/movies/movieTypeRegistry.cxx b/panda/src/movies/movieTypeRegistry.cxx index 751b6c5e6e..f9efd97b88 100644 --- a/panda/src/movies/movieTypeRegistry.cxx +++ b/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" diff --git a/panda/src/movies/wavAudioCursor.cxx b/panda/src/movies/wavAudioCursor.cxx index 4133b2af74..15da3a00c3 100644 --- a/panda/src/movies/wavAudioCursor.cxx +++ b/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. diff --git a/panda/src/movies/wavAudioCursor.h b/panda/src/movies/wavAudioCursor.h index f8d220160e..e0afd76772 100644 --- a/panda/src/movies/wavAudioCursor.h +++ b/panda/src/movies/wavAudioCursor.h @@ -19,7 +19,7 @@ #include "movieAudioCursor.h" #include "streamReader.h" -class WavAudio; +#include "wavAudio.h" //////////////////////////////////////////////////////////////////// // Class : WavAudioCursor diff --git a/panda/src/nativenet/socket_tcp_listen.h b/panda/src/nativenet/socket_tcp_listen.h index 5b9f48ab32..070493ed5e 100755 --- a/panda/src/nativenet/socket_tcp_listen.h +++ b/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 diff --git a/panda/src/nativenet/socket_tcp_ssl.h b/panda/src/nativenet/socket_tcp_ssl.h index eed8379db5..6845e1a383 100755 --- a/panda/src/nativenet/socket_tcp_ssl.h +++ b/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" diff --git a/panda/src/nativenet/socket_udp_outgoing.h b/panda/src/nativenet/socket_udp_outgoing.h index 75fba03eb8..d804a79d7a 100755 --- a/panda/src/nativenet/socket_udp_outgoing.h +++ b/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 // diff --git a/panda/src/net/connectionListener.cxx b/panda/src/net/connectionListener.cxx index b4059ecb71..08ea7d4d17 100644 --- a/panda/src/net/connectionListener.cxx +++ b/panda/src/net/connectionListener.cxx @@ -12,6 +12,7 @@ // //////////////////////////////////////////////////////////////////// +#include "dcast.h" #include "connectionListener.h" #include "connection.h" #include "connectionManager.h" diff --git a/panda/src/net/connectionManager.cxx b/panda/src/net/connectionManager.cxx index fd4d63a169..56d1b1f881 100644 --- a/panda/src/net/connectionManager.cxx +++ b/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" diff --git a/panda/src/net/connectionReader.cxx b/panda/src/net/connectionReader.cxx index 1d277403cc..e0a8b35fa7 100644 --- a/panda/src/net/connectionReader.cxx +++ b/panda/src/net/connectionReader.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "connectionReader.h" +#include "dcast.h" #include "connectionManager.h" #include "netDatagram.h" #include "datagramTCPHeader.h" diff --git a/panda/src/net/datagramGeneratorNet.h b/panda/src/net/datagramGeneratorNet.h index 1709ebab67..b26be45ff1 100644 --- a/panda/src/net/datagramGeneratorNet.h +++ b/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); diff --git a/panda/src/ode/odeBody.cxx b/panda/src/ode/odeBody.cxx index cbb35977ae..377ffe152a 100755 --- a/panda/src/ode/odeBody.cxx +++ b/panda/src/ode/odeBody.cxx @@ -14,6 +14,7 @@ #include "config_ode.h" #include "odeBody.h" +#include "odeJoint.h" TypeHandle OdeBody::_type_handle; diff --git a/panda/src/ode/odeGeom.cxx b/panda/src/ode/odeGeom.cxx index f7a539c1c5..ea538178d2 100755 --- a/panda/src/ode/odeGeom.cxx +++ b/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; diff --git a/panda/src/ode/odeJoint.cxx b/panda/src/ode/odeJoint.cxx index 8aa287e30a..6d12fa3b13 100755 --- a/panda/src/ode/odeJoint.cxx +++ b/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; diff --git a/panda/src/ode/odeSpace.cxx b/panda/src/ode/odeSpace.cxx index e98086c711..1fd4d3fe25 100755 --- a/panda/src/ode/odeSpace.cxx +++ b/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" diff --git a/panda/src/ode/odeWorld.cxx b/panda/src/ode/odeWorld.cxx index e9ef94a72f..b7d76fd5b7 100755 --- a/panda/src/ode/odeWorld.cxx +++ b/panda/src/ode/odeWorld.cxx @@ -14,6 +14,7 @@ #include "config_ode.h" #include "odeWorld.h" +#include "odeBody.h" TypeHandle OdeWorld::_type_handle; diff --git a/panda/src/pgraphnodes/computeNode.h b/panda/src/pgraphnodes/computeNode.h index 1a24b6df7f..d6b835d6ce 100644 --- a/panda/src/pgraphnodes/computeNode.h +++ b/panda/src/pgraphnodes/computeNode.h @@ -18,6 +18,7 @@ #include "pandabase.h" #include "pandaNode.h" #include "callbackObject.h" +#include "callbackNode.h" #include "pointerTo.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/pipeline/lightMutexDirect.h b/panda/src/pipeline/lightMutexDirect.h index b145661604..bd2ee35071 100644 --- a/panda/src/pipeline/lightMutexDirect.h +++ b/panda/src/pipeline/lightMutexDirect.h @@ -17,6 +17,7 @@ #include "pandabase.h" #include "mutexImpl.h" +#include "mutexTrueImpl.h" #include "pnotify.h" class Thread; diff --git a/panda/src/putil/buttonMap.cxx b/panda/src/putil/buttonMap.cxx index 40f609760c..db88e6df24 100644 --- a/panda/src/putil/buttonMap.cxx +++ b/panda/src/putil/buttonMap.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "buttonMap.h" +#include "indent.h" TypeHandle ButtonMap::_type_handle;