From b8479388a7111f9ee0a72cfd720fdbdbdef3de89 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Fri, 8 Jun 2001 23:56:30 +0000 Subject: [PATCH] remove pch --- panda/src/builder/Sources.pp | 2 -- panda/src/chan/Sources.pp | 2 -- panda/src/chan/animBundle.cxx | 7 ------- panda/src/chan/animBundleNode.cxx | 7 ------- panda/src/chan/animChannel.cxx | 7 ------- panda/src/chan/animChannelBase.cxx | 7 ------- panda/src/chan/animChannelMatrixXfmTable.cxx | 7 ------- panda/src/chan/animChannelScalarTable.cxx | 7 ------- panda/src/chan/animControl.cxx | 7 ------- panda/src/chan/animControlCollection.cxx | 7 ------- panda/src/chan/animGroup.cxx | 7 ------- panda/src/chan/auto_bind.cxx | 7 ------- panda/src/chan/config_chan.cxx | 7 ------- panda/src/chan/movingPartBase.cxx | 7 ------- panda/src/chan/movingPartMatrix.cxx | 7 ------- panda/src/chan/movingPartScalar.cxx | 7 ------- panda/src/chan/partBundle.cxx | 7 ------- panda/src/chan/partBundleNode.cxx | 7 ------- panda/src/chan/partGroup.cxx | 7 ------- panda/src/chancfg/chanlayout.cxx | 9 --------- panda/src/char/Sources.pp | 2 -- panda/src/char/character.cxx | 11 ----------- panda/src/char/characterJoint.cxx | 8 -------- panda/src/char/characterJointBundle.cxx | 8 -------- panda/src/char/characterSlider.cxx | 8 -------- panda/src/char/computedVertices.cxx | 8 -------- panda/src/char/computedVerticesMorph.cxx | 7 ------- panda/src/char/config_char.cxx | 8 -------- panda/src/char/dynamicVertices.cxx | 9 --------- panda/src/chat/Sources.pp | 2 -- panda/src/chat/chatInput.cxx | 6 ------ panda/src/chat/config_chat.cxx | 9 --------- panda/src/collide/Sources.pp | 2 -- panda/src/collide/collisionEntry.cxx | 8 -------- panda/src/collide/collisionHandler.cxx | 7 ------- panda/src/collide/collisionHandlerEvent.cxx | 7 ------- panda/src/collide/collisionHandlerFloor.cxx | 7 ------- panda/src/collide/collisionHandlerPhysical.cxx | 7 ------- panda/src/collide/collisionHandlerPusher.cxx | 7 ------- panda/src/collide/collisionHandlerQueue.cxx | 7 ------- panda/src/collide/collisionLevelState.cxx | 7 ------- panda/src/collide/collisionNode.cxx | 7 ------- panda/src/collide/collisionPlane.cxx | 7 ------- panda/src/collide/collisionPolygon.cxx | 7 ------- panda/src/collide/collisionRay.cxx | 9 --------- panda/src/collide/collisionSegment.cxx | 7 ------- panda/src/collide/collisionSolid.cxx | 7 ------- panda/src/collide/collisionSphere.cxx | 7 ------- panda/src/collide/collisionTraverser.cxx | 7 ------- panda/src/collide/config_collide.cxx | 10 ---------- panda/src/cull/Sources.pp | 2 -- panda/src/cull/config_cull.cxx | 7 ------- panda/src/cull/cullState.cxx | 7 ------- panda/src/cull/cullStateLookup.cxx | 7 ------- panda/src/cull/cullStateSubtree.cxx | 7 ------- panda/src/cull/cullTraverser.cxx | 7 ------- panda/src/cull/directRenderTransition.cxx | 7 ------- panda/src/cull/geomBin.cxx | 7 ------- panda/src/cull/geomBinAttribute.cxx | 7 ------- panda/src/cull/geomBinBackToFront.cxx | 7 ------- panda/src/cull/geomBinFixed.cxx | 7 ------- panda/src/cull/geomBinGroup.cxx | 8 -------- panda/src/cull/geomBinNormal.cxx | 7 ------- panda/src/cull/geomBinTransition.cxx | 9 --------- panda/src/cull/geomBinUnsorted.cxx | 9 --------- panda/src/device/Sources.pp | 2 -- panda/src/device/analogNode.cxx | 7 ------- panda/src/device/buttonNode.cxx | 7 ------- panda/src/device/clientAnalogDevice.cxx | 7 ------- panda/src/device/clientBase.cxx | 7 ------- panda/src/device/clientButtonDevice.cxx | 7 ------- panda/src/device/clientDevice.cxx | 7 ------- panda/src/device/clientDialDevice.cxx | 7 ------- panda/src/device/clientTrackerDevice.cxx | 7 ------- panda/src/device/config_device.cxx | 7 ------- panda/src/device/dialNode.cxx | 7 ------- panda/src/device/mouse.cxx | 7 ------- panda/src/device/trackerData.cxx | 6 ------ panda/src/device/trackerNode.cxx | 7 ------- panda/src/dgraph/Sources.pp | 2 -- panda/src/dgraph/buttonEventDataAttribute.cxx | 7 ------- panda/src/dgraph/buttonEventDataTransition.cxx | 7 ------- panda/src/dgraph/config_dgraph.cxx | 7 ------- panda/src/dgraph/dataGraphTraversal.cxx | 7 ------- panda/src/dgraph/dataGraphTraverser.cxx | 7 ------- panda/src/dgraph/dataNode.cxx | 7 ------- panda/src/dgraph/dataRelation.cxx | 7 ------- panda/src/dgraph/describe_data_verbose.cxx | 7 ------- panda/src/dgraph/doubleDataAttribute.cxx | 7 ------- panda/src/dgraph/doubleDataTransition.cxx | 7 ------- panda/src/dgraph/doublePtrDataAttribute.cxx | 7 ------- panda/src/dgraph/doublePtrDataTransition.cxx | 7 ------- panda/src/dgraph/intDataAttribute.cxx | 7 ------- panda/src/dgraph/intDataTransition.cxx | 7 ------- panda/src/dgraph/matrixDataAttribute.cxx | 7 ------- panda/src/dgraph/matrixDataTransition.cxx | 7 ------- panda/src/dgraph/vec3DataAttribute.cxx | 7 ------- panda/src/dgraph/vec3DataTransition.cxx | 7 ------- panda/src/dgraph/vec4DataAttribute.cxx | 7 ------- panda/src/dgraph/vec4DataTransition.cxx | 8 -------- panda/src/display/Sources.pp | 2 -- panda/src/display/config_display.cxx | 7 ------- panda/src/display/displayRegion.cxx | 7 ------- panda/src/display/graphicsChannel.cxx | 7 ------- panda/src/display/graphicsLayer.cxx | 7 ------- panda/src/display/graphicsPipe.cxx | 7 ------- panda/src/display/graphicsStateGuardian.cxx | 7 ------- panda/src/display/graphicsWindow.cxx | 7 ------- panda/src/display/graphicsWindowInputDevice.cxx | 7 ------- panda/src/display/hardwareChannel.cxx | 7 ------- panda/src/display/interactiveGraphicsPipe.cxx | 7 ------- panda/src/display/noninteractiveGraphicsPipe.cxx | 7 ------- panda/src/display/pipeSpec.cxx | 7 ------- panda/src/display/savedFrameBuffer.cxx | 7 ------- panda/src/display/textureContext.cxx | 8 -------- panda/src/express/Sources.pp | 2 -- panda/src/express/buffer.cxx | 6 ------ panda/src/express/clockObject.cxx | 7 ------- panda/src/express/config_express.cxx | 7 ------- panda/src/express/crypto_utils.cxx | 7 ------- panda/src/express/datagram.cxx | 7 ------- panda/src/express/datagramGenerator.cxx | 7 ------- panda/src/express/datagramInputFile.cxx | 7 ------- panda/src/express/datagramIterator.cxx | 7 ------- panda/src/express/datagramOutputFile.cxx | 6 ------ panda/src/express/datagramSink.cxx | 6 ------ panda/src/express/error_utils.cxx | 7 ------- panda/src/express/get_config_path.cxx | 7 ------- panda/src/express/hashVal.cxx | 7 ------- panda/src/express/indent.cxx | 7 ------- panda/src/express/memoryUsage.cxx | 10 +--------- panda/src/express/memoryUsagePointers.cxx | 14 -------------- panda/src/express/multifile.cxx | 7 ------- panda/src/express/namable.cxx | 6 ------ panda/src/express/patchfile.cxx | 7 ------- panda/src/express/profileTimer.cxx | 7 ------- panda/src/express/referenceCount.cxx | 7 ------- panda/src/express/reversedNumericData.cxx | 7 ------- panda/src/express/trueClock.cxx | 14 -------------- panda/src/express/typeHandle.cxx | 8 -------- panda/src/express/typedReferenceCount.cxx | 7 ------- panda/src/lerp/Sources.pp | 2 -- panda/src/lerp/config_lerp.cxx | 7 ------- panda/src/lerp/lerp.cxx | 7 ------- panda/src/lerp/lerpblend.cxx | 6 ------ panda/src/lerp/lerpfunctor.cxx | 8 -------- panda/src/sgattrib/Sources.pp | 3 +-- 147 files changed, 2 insertions(+), 1008 deletions(-) diff --git a/panda/src/builder/Sources.pp b/panda/src/builder/Sources.pp index 966157028b..b04fb88e79 100644 --- a/panda/src/builder/Sources.pp +++ b/panda/src/builder/Sources.pp @@ -40,8 +40,6 @@ builderTypes.h builderVertex.I builderVertex.h builderVertexTempl.I \ builderVertexTempl.h config_builder.h -// #define PRECOMPILED_HEADER builder_headers.h - #end lib_target #begin test_bin_target diff --git a/panda/src/chan/Sources.pp b/panda/src/chan/Sources.pp index 9c73c6110f..ea3aa62887 100644 --- a/panda/src/chan/Sources.pp +++ b/panda/src/chan/Sources.pp @@ -45,8 +45,6 @@ partBundleNode.I partBundleNode.h partGroup.I partGroup.h \ vector_PartGroupStar.h -// #define PRECOMPILED_HEADER chan_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/chan/animBundle.cxx b/panda/src/chan/animBundle.cxx index 6b62f70b8e..b05b9b89cd 100644 --- a/panda/src/chan/animBundle.cxx +++ b/panda/src/chan/animBundle.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animBundle.h" #include @@ -30,7 +24,6 @@ #include #include #include -#endif TypeHandle AnimBundle::_type_handle; diff --git a/panda/src/chan/animBundleNode.cxx b/panda/src/chan/animBundleNode.cxx index cb825ceafa..706bd5b3b4 100644 --- a/panda/src/chan/animBundleNode.cxx +++ b/panda/src/chan/animBundleNode.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animBundleNode.h" #include #include #include #include -#endif TypeHandle AnimBundleNode::_type_handle; diff --git a/panda/src/chan/animChannel.cxx b/panda/src/chan/animChannel.cxx index 188f66a73f..9deeebaa95 100644 --- a/panda/src/chan/animChannel.cxx +++ b/panda/src/chan/animChannel.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannel.h" #include -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/chan/animChannelBase.cxx b/panda/src/chan/animChannelBase.cxx index c01b5c61df..cf863ddbc5 100644 --- a/panda/src/chan/animChannelBase.cxx +++ b/panda/src/chan/animChannelBase.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannelBase.h" #include #include #include #include -#endif TypeHandle AnimChannelBase::_type_handle; diff --git a/panda/src/chan/animChannelMatrixXfmTable.cxx b/panda/src/chan/animChannelMatrixXfmTable.cxx index b9b6eb8de9..fcdab1bd5e 100644 --- a/panda/src/chan/animChannelMatrixXfmTable.cxx +++ b/panda/src/chan/animChannelMatrixXfmTable.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannelMatrixXfmTable.h" #include "animBundle.h" #include "config_chan.h" @@ -34,7 +28,6 @@ #include #include #include -#endif TypeHandle AnimChannelMatrixXfmTable::_type_handle; diff --git a/panda/src/chan/animChannelScalarTable.cxx b/panda/src/chan/animChannelScalarTable.cxx index a86674a826..1f1e2ddf9d 100644 --- a/panda/src/chan/animChannelScalarTable.cxx +++ b/panda/src/chan/animChannelScalarTable.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannelScalarTable.h" #include "animBundle.h" #include "config_chan.h" @@ -33,7 +27,6 @@ #include #include #include -#endif TypeHandle AnimChannelScalarTable::_type_handle; diff --git a/panda/src/chan/animControl.cxx b/panda/src/chan/animControl.cxx index 514b9508d3..94b5a7364b 100644 --- a/panda/src/chan/animControl.cxx +++ b/panda/src/chan/animControl.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animControl.h" #include "animChannelBase.h" #include "partBundle.h" @@ -30,7 +24,6 @@ #include #include -#endif TypeHandle AnimControl::_type_handle; diff --git a/panda/src/chan/animControlCollection.cxx b/panda/src/chan/animControlCollection.cxx index 7f7222e03b..16d2be2fad 100644 --- a/panda/src/chan/animControlCollection.cxx +++ b/panda/src/chan/animControlCollection.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animControlCollection.h" -#endif //////////////////////////////////////////////////////////////////// diff --git a/panda/src/chan/animGroup.cxx b/panda/src/chan/animGroup.cxx index 179c407f5f..a21a729e47 100644 --- a/panda/src/chan/animGroup.cxx +++ b/panda/src/chan/animGroup.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animGroup.h" #include "animBundle.h" #include "config_chan.h" @@ -33,7 +27,6 @@ #include #include -#endif #include diff --git a/panda/src/chan/auto_bind.cxx b/panda/src/chan/auto_bind.cxx index 1ac4a3a086..0ce9211bdc 100644 --- a/panda/src/chan/auto_bind.cxx +++ b/panda/src/chan/auto_bind.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "animBundleNode.h" #include "partBundleNode.h" #include "config_chan.h" -#endif #include #include diff --git a/panda/src/chan/config_chan.cxx b/panda/src/chan/config_chan.cxx index 25d657b7e2..9ae0e2e6f9 100644 --- a/panda/src/chan/config_chan.cxx +++ b/panda/src/chan/config_chan.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_chan.h" #include "animBundle.h" #include "animBundleNode.h" @@ -37,7 +31,6 @@ #include "partBundle.h" #include "partBundleNode.h" #include "partGroup.h" -#endif #include #include diff --git a/panda/src/chan/movingPartBase.cxx b/panda/src/chan/movingPartBase.cxx index 3e3ebe2b8e..1ed2cc5b69 100644 --- a/panda/src/chan/movingPartBase.cxx +++ b/panda/src/chan/movingPartBase.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "movingPartBase.h" #include "animControl.h" #include "animChannelBase.h" #include -#endif TypeHandle MovingPartBase::_type_handle; diff --git a/panda/src/chan/movingPartMatrix.cxx b/panda/src/chan/movingPartMatrix.cxx index 844a6d2d20..7680fcf102 100644 --- a/panda/src/chan/movingPartMatrix.cxx +++ b/panda/src/chan/movingPartMatrix.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "movingPartMatrix.h" #include @@ -30,7 +24,6 @@ #include #include #include -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/chan/movingPartScalar.cxx b/panda/src/chan/movingPartScalar.cxx index 030d55c203..0f54ac326d 100644 --- a/panda/src/chan/movingPartScalar.cxx +++ b/panda/src/chan/movingPartScalar.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "movingPartScalar.h" #include #include #include #include -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/chan/partBundle.cxx b/panda/src/chan/partBundle.cxx index a8403cf20b..f48ba4f530 100644 --- a/panda/src/chan/partBundle.cxx +++ b/panda/src/chan/partBundle.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "partBundle.h" #include "animBundle.h" #include "animControl.h" @@ -33,7 +27,6 @@ #include #include #include -#endif TypeHandle PartBundle::_type_handle; diff --git a/panda/src/chan/partBundleNode.cxx b/panda/src/chan/partBundleNode.cxx index 6355b61c85..74c20ba94d 100644 --- a/panda/src/chan/partBundleNode.cxx +++ b/panda/src/chan/partBundleNode.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "partBundleNode.h" #include #include #include #include -#endif TypeHandle PartBundleNode::_type_handle; diff --git a/panda/src/chan/partGroup.cxx b/panda/src/chan/partGroup.cxx index 26d0420a4a..36c91ba76f 100644 --- a/panda/src/chan/partGroup.cxx +++ b/panda/src/chan/partGroup.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chan_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "partGroup.h" #include "animGroup.h" #include "config_chan.h" @@ -32,7 +26,6 @@ #include #include #include -#endif #include diff --git a/panda/src/chancfg/chanlayout.cxx b/panda/src/chancfg/chanlayout.cxx index 85b4dc5700..21e22e9d78 100644 --- a/panda/src/chancfg/chanlayout.cxx +++ b/panda/src/chancfg/chanlayout.cxx @@ -16,19 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chancfg_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "chanlayout.h" #include "chanparse.h" #include "chanshare.h" - #include -#endif LayoutType* LayoutDB = (LayoutType*)0; diff --git a/panda/src/char/Sources.pp b/panda/src/char/Sources.pp index dab509fb78..ccc163fea4 100644 --- a/panda/src/char/Sources.pp +++ b/panda/src/char/Sources.pp @@ -27,8 +27,6 @@ computedVertices.h computedVerticesMorph.I computedVerticesMorph.h \ config_char.h dynamicVertices.h -// #define PRECOMPILED_HEADER char_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/char/character.cxx b/panda/src/char/character.cxx index 5c67d611b7..999c574442 100644 --- a/panda/src/char/character.cxx +++ b/panda/src/char/character.cxx @@ -16,13 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "character.h" #include "characterJoint.h" #include "computedVertices.h" @@ -34,15 +27,11 @@ #include #include #include -#endif - #include #include #include #include - - TypeHandle Character::_type_handle; #ifndef CPPPARSER diff --git a/panda/src/char/characterJoint.cxx b/panda/src/char/characterJoint.cxx index 052b476e03..ac0f12b637 100644 --- a/panda/src/char/characterJoint.cxx +++ b/panda/src/char/characterJoint.cxx @@ -16,13 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "characterJoint.h" #include "config_char.h" @@ -32,7 +25,6 @@ #include #include #include -#endif TypeHandle CharacterJoint::_type_handle; diff --git a/panda/src/char/characterJointBundle.cxx b/panda/src/char/characterJointBundle.cxx index e888947924..00f12606a9 100644 --- a/panda/src/char/characterJointBundle.cxx +++ b/panda/src/char/characterJointBundle.cxx @@ -16,20 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "characterJointBundle.h" #include "character.h" #include #include #include #include -#endif TypeHandle CharacterJointBundle::_type_handle; diff --git a/panda/src/char/characterSlider.cxx b/panda/src/char/characterSlider.cxx index 1a62720f48..c1bf4ea3d1 100644 --- a/panda/src/char/characterSlider.cxx +++ b/panda/src/char/characterSlider.cxx @@ -16,19 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "characterSlider.h" #include #include #include #include -#endif TypeHandle CharacterSlider::_type_handle; diff --git a/panda/src/char/computedVertices.cxx b/panda/src/char/computedVertices.cxx index 34ed1dc219..d37948397e 100644 --- a/panda/src/char/computedVertices.cxx +++ b/panda/src/char/computedVertices.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "computedVertices.h" #include "characterJoint.h" #include "character.h" @@ -33,8 +27,6 @@ #include #include #include -#endif - #include TypeHandle ComputedVertices::_type_handle; diff --git a/panda/src/char/computedVerticesMorph.cxx b/panda/src/char/computedVerticesMorph.cxx index c518aeb7b3..6f0287181a 100644 --- a/panda/src/char/computedVerticesMorph.cxx +++ b/panda/src/char/computedVerticesMorph.cxx @@ -16,20 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "computedVerticesMorph.h" #include #include #include #include -#endif //////////////////////////////////////////////////////////////////// // Function: ComputedVerticesMorphValue2::write_datagram diff --git a/panda/src/char/config_char.cxx b/panda/src/char/config_char.cxx index 3238d76eb0..ff21ef0495 100644 --- a/panda/src/char/config_char.cxx +++ b/panda/src/char/config_char.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_char.h" #include "character.h" #include "characterJoint.h" @@ -30,8 +24,6 @@ #include "characterSlider.h" #include "computedVertices.h" #include "dynamicVertices.h" -#endif - #include #include diff --git a/panda/src/char/dynamicVertices.cxx b/panda/src/char/dynamicVertices.cxx index 4a91a87777..81813d67d9 100644 --- a/panda/src/char/dynamicVertices.cxx +++ b/panda/src/char/dynamicVertices.cxx @@ -16,13 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "char_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dynamicVertices.h" #include "config_char.h" #include @@ -30,11 +23,9 @@ #include #include #include -#endif TypeHandle DynamicVertices::_type_handle; - //////////////////////////////////////////////////////////////////// // Function: DynamicVertices::Constructor // Access: Public diff --git a/panda/src/chat/Sources.pp b/panda/src/chat/Sources.pp index 9b78d377e6..04a6f442c1 100644 --- a/panda/src/chat/Sources.pp +++ b/panda/src/chat/Sources.pp @@ -17,8 +17,6 @@ #define INSTALL_HEADERS \ chatHelpers.h chatInput.I chatInput.h -// #define PRECOMPILED_HEADER chat_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/chat/chatInput.cxx b/panda/src/chat/chatInput.cxx index 9c9387c1ed..bec1088342 100644 --- a/panda/src/chat/chatInput.cxx +++ b/panda/src/chat/chatInput.cxx @@ -15,14 +15,8 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chat_headers.h" -#endif - -#pragma hdrstop #include "chatInput.h" - #include #include #include diff --git a/panda/src/chat/config_chat.cxx b/panda/src/chat/config_chat.cxx index 6f41020cf3..661ea869ee 100644 --- a/panda/src/chat/config_chat.cxx +++ b/panda/src/chat/config_chat.cxx @@ -16,16 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "chat_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "chatInput.h" -#endif - #include "config_chat.h" #include diff --git a/panda/src/collide/Sources.pp b/panda/src/collide/Sources.pp index 6c92d63348..8f07f1de36 100644 --- a/panda/src/collide/Sources.pp +++ b/panda/src/collide/Sources.pp @@ -46,8 +46,6 @@ collisionSolid.I collisionSolid.h collisionSphere.I \ collisionSphere.h collisionTraverser.I collisionTraverser.h -// #define PRECOMPILED_HEADER collide_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/collide/collisionEntry.cxx b/panda/src/collide/collisionEntry.cxx index 11535727bb..8397700183 100644 --- a/panda/src/collide/collisionEntry.cxx +++ b/panda/src/collide/collisionEntry.cxx @@ -16,15 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionEntry.h" -#endif TypeHandle CollisionEntry::_type_handle; diff --git a/panda/src/collide/collisionHandler.cxx b/panda/src/collide/collisionHandler.cxx index 60af9972c6..3dfe754801 100644 --- a/panda/src/collide/collisionHandler.cxx +++ b/panda/src/collide/collisionHandler.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionHandler.h" -#endif TypeHandle CollisionHandler::_type_handle; diff --git a/panda/src/collide/collisionHandlerEvent.cxx b/panda/src/collide/collisionHandlerEvent.cxx index bb02bd49ab..894bb495c3 100644 --- a/panda/src/collide/collisionHandlerEvent.cxx +++ b/panda/src/collide/collisionHandlerEvent.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionHandlerEvent.h" #include "config_collide.h" -#endif #include #include diff --git a/panda/src/collide/collisionHandlerFloor.cxx b/panda/src/collide/collisionHandlerFloor.cxx index 31600fa859..db2101d234 100644 --- a/panda/src/collide/collisionHandlerFloor.cxx +++ b/panda/src/collide/collisionHandlerFloor.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionHandlerFloor.h" #include "config_collide.h" #include #include -#endif #include diff --git a/panda/src/collide/collisionHandlerPhysical.cxx b/panda/src/collide/collisionHandlerPhysical.cxx index 66a174df09..64e1f4001b 100644 --- a/panda/src/collide/collisionHandlerPhysical.cxx +++ b/panda/src/collide/collisionHandlerPhysical.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionHandlerPhysical.h" #include "config_collide.h" #include #include -#endif TypeHandle CollisionHandlerPhysical::_type_handle; diff --git a/panda/src/collide/collisionHandlerPusher.cxx b/panda/src/collide/collisionHandlerPusher.cxx index d11fb3c122..314fc0f511 100644 --- a/panda/src/collide/collisionHandlerPusher.cxx +++ b/panda/src/collide/collisionHandlerPusher.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionHandlerPusher.h" #include "config_collide.h" -#endif TypeHandle CollisionHandlerPusher::_type_handle; diff --git a/panda/src/collide/collisionHandlerQueue.cxx b/panda/src/collide/collisionHandlerQueue.cxx index c885ef2c38..76a5472ab5 100644 --- a/panda/src/collide/collisionHandlerQueue.cxx +++ b/panda/src/collide/collisionHandlerQueue.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionHandlerQueue.h" #include "config_collide.h" -#endif TypeHandle CollisionHandlerQueue::_type_handle; diff --git a/panda/src/collide/collisionLevelState.cxx b/panda/src/collide/collisionLevelState.cxx index db2ab1ada6..f0a346d588 100644 --- a/panda/src/collide/collisionLevelState.cxx +++ b/panda/src/collide/collisionLevelState.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionSolid.h" #include "collisionNode.h" -#endif #include "collisionLevelState.h" diff --git a/panda/src/collide/collisionNode.cxx b/panda/src/collide/collisionNode.cxx index 1f9b330564..2ae1ec370d 100644 --- a/panda/src/collide/collisionNode.cxx +++ b/panda/src/collide/collisionNode.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionNode.h" #include "config_collide.h" @@ -30,7 +24,6 @@ #include #include #include -#endif TypeHandle CollisionNode::_type_handle; diff --git a/panda/src/collide/collisionPlane.cxx b/panda/src/collide/collisionPlane.cxx index ca4a1e52e5..ffb51f90c1 100644 --- a/panda/src/collide/collisionPlane.cxx +++ b/panda/src/collide/collisionPlane.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionPlane.h" #include "collisionHandler.h" #include "collisionEntry.h" @@ -37,7 +31,6 @@ #include #include #include -#endif #include #include diff --git a/panda/src/collide/collisionPolygon.cxx b/panda/src/collide/collisionPolygon.cxx index 54a9bd0099..b3f45dde22 100644 --- a/panda/src/collide/collisionPolygon.cxx +++ b/panda/src/collide/collisionPolygon.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionPolygon.h" #include "collisionHandler.h" #include "collisionEntry.h" @@ -39,7 +33,6 @@ #include #include #include -#endif #include #include diff --git a/panda/src/collide/collisionRay.cxx b/panda/src/collide/collisionRay.cxx index 457cc9ba67..24a3140ab4 100644 --- a/panda/src/collide/collisionRay.cxx +++ b/panda/src/collide/collisionRay.cxx @@ -16,25 +16,16 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionRay.h" #include "collisionHandler.h" #include "collisionEntry.h" #include "config_collide.h" - #include #include #include #include #include #include -#endif TypeHandle CollisionRay::_type_handle; diff --git a/panda/src/collide/collisionSegment.cxx b/panda/src/collide/collisionSegment.cxx index 956dfdce1b..813b683642 100644 --- a/panda/src/collide/collisionSegment.cxx +++ b/panda/src/collide/collisionSegment.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionSegment.h" #include "collisionHandler.h" #include "collisionEntry.h" @@ -32,7 +26,6 @@ #include #include #include -#endif #include #include diff --git a/panda/src/collide/collisionSolid.cxx b/panda/src/collide/collisionSolid.cxx index 3b397dffc1..8e43d398bb 100644 --- a/panda/src/collide/collisionSolid.cxx +++ b/panda/src/collide/collisionSolid.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionSolid.h" #include "config_collide.h" #include "collisionEntry.h" @@ -36,7 +30,6 @@ #include #include #include -#endif #include #include diff --git a/panda/src/collide/collisionSphere.cxx b/panda/src/collide/collisionSphere.cxx index a3d8c8b169..562ef25801 100644 --- a/panda/src/collide/collisionSphere.cxx +++ b/panda/src/collide/collisionSphere.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionSphere.h" #include "collisionRay.h" #include "collisionSegment.h" @@ -36,7 +30,6 @@ #include #include #include -#endif #include #include diff --git a/panda/src/collide/collisionTraverser.cxx b/panda/src/collide/collisionTraverser.cxx index 6840667621..d94c9408cb 100644 --- a/panda/src/collide/collisionTraverser.cxx +++ b/panda/src/collide/collisionTraverser.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "collisionNode.h" #include "collisionEntry.h" #include "collisionPolygon.h" @@ -31,7 +25,6 @@ #include #include #include -#endif #include "collisionTraverser.h" #include diff --git a/panda/src/collide/config_collide.cxx b/panda/src/collide/config_collide.cxx index 6324cbfe60..b2a8ee7b4f 100644 --- a/panda/src/collide/config_collide.cxx +++ b/panda/src/collide/config_collide.cxx @@ -16,13 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "collide_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_collide.h" #include "collisionEntry.h" #include "collisionHandler.h" @@ -38,9 +31,6 @@ #include "collisionSegment.h" #include "collisionSolid.h" #include "collisionSphere.h" - -#endif - #include Configure(config_collide); diff --git a/panda/src/cull/Sources.pp b/panda/src/cull/Sources.pp index c41985aad2..a7f1165aa9 100644 --- a/panda/src/cull/Sources.pp +++ b/panda/src/cull/Sources.pp @@ -40,8 +40,6 @@ #define IGATESCAN all -// #define PRECOMPILED_HEADER cull_headers.h - #end lib_target #begin test_bin_target diff --git a/panda/src/cull/config_cull.cxx b/panda/src/cull/config_cull.cxx index f7b2eef6c4..8485da7dcf 100644 --- a/panda/src/cull/config_cull.cxx +++ b/panda/src/cull/config_cull.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_cull.h" #include "cullTraverser.h" #include "geomBin.h" @@ -34,7 +28,6 @@ #include "geomBinAttribute.h" #include "geomBinFixed.h" #include "directRenderTransition.h" -#endif #include diff --git a/panda/src/cull/cullState.cxx b/panda/src/cull/cullState.cxx index 0e41f8671e..aaf49895b9 100644 --- a/panda/src/cull/cullState.cxx +++ b/panda/src/cull/cullState.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "cullState.h" #include "config_cull.h" #include #include -#endif #include diff --git a/panda/src/cull/cullStateLookup.cxx b/panda/src/cull/cullStateLookup.cxx index 40d0b293b3..98a73e5383 100644 --- a/panda/src/cull/cullStateLookup.cxx +++ b/panda/src/cull/cullStateLookup.cxx @@ -16,18 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "cullState.h" #include "cullStateSubtree.h" #include -#endif #include "cullStateLookup.h" diff --git a/panda/src/cull/cullStateSubtree.cxx b/panda/src/cull/cullStateSubtree.cxx index 50cd7b0636..7dee76f630 100644 --- a/panda/src/cull/cullStateSubtree.cxx +++ b/panda/src/cull/cullStateSubtree.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "cullStateSubtree.h" #include "config_cull.h" -#endif //////////////////////////////////////////////////////////////////// diff --git a/panda/src/cull/cullTraverser.cxx b/panda/src/cull/cullTraverser.cxx index 8b1146894a..71a7a8c7f2 100644 --- a/panda/src/cull/cullTraverser.cxx +++ b/panda/src/cull/cullTraverser.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "cullTraverser.h" #include "geomBinTransition.h" #include "geomBinAttribute.h" @@ -38,7 +32,6 @@ #include #include #include -#endif #include #include diff --git a/panda/src/cull/directRenderTransition.cxx b/panda/src/cull/directRenderTransition.cxx index 50a397ef0a..41f9076007 100644 --- a/panda/src/cull/directRenderTransition.cxx +++ b/panda/src/cull/directRenderTransition.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "directRenderTransition.h" #include -#endif TypeHandle DirectRenderTransition::_type_handle; diff --git a/panda/src/cull/geomBin.cxx b/panda/src/cull/geomBin.cxx index 90f1d3aa61..f9bdbff36b 100644 --- a/panda/src/cull/geomBin.cxx +++ b/panda/src/cull/geomBin.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBin.h" #include "cullTraverser.h" #include "config_cull.h" @@ -35,7 +29,6 @@ #include #include #include -#endif TypeHandle GeomBin::_type_handle; diff --git a/panda/src/cull/geomBinAttribute.cxx b/panda/src/cull/geomBinAttribute.cxx index adb2d692e5..11129a2ebe 100644 --- a/panda/src/cull/geomBinAttribute.cxx +++ b/panda/src/cull/geomBinAttribute.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBinAttribute.h" #include "geomBinTransition.h" #include #include -#endif #include diff --git a/panda/src/cull/geomBinBackToFront.cxx b/panda/src/cull/geomBinBackToFront.cxx index 756885aca3..2ec55e8e69 100644 --- a/panda/src/cull/geomBinBackToFront.cxx +++ b/panda/src/cull/geomBinBackToFront.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBinBackToFront.h" #include "cullTraverser.h" @@ -32,7 +26,6 @@ #include #include #include -#endif TypeHandle GeomBinBackToFront::_type_handle; diff --git a/panda/src/cull/geomBinFixed.cxx b/panda/src/cull/geomBinFixed.cxx index 3d5fb12cca..e4d0feb99a 100644 --- a/panda/src/cull/geomBinFixed.cxx +++ b/panda/src/cull/geomBinFixed.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBinFixed.h" #include "cullTraverser.h" @@ -32,7 +26,6 @@ #include #include #include -#endif #include diff --git a/panda/src/cull/geomBinGroup.cxx b/panda/src/cull/geomBinGroup.cxx index df83f4a047..46f76c030d 100644 --- a/panda/src/cull/geomBinGroup.cxx +++ b/panda/src/cull/geomBinGroup.cxx @@ -16,20 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBinGroup.h" #include "cullTraverser.h" - #include #include #include -#endif TypeHandle GeomBinGroup::_type_handle; diff --git a/panda/src/cull/geomBinNormal.cxx b/panda/src/cull/geomBinNormal.cxx index 219da8909c..b6839ef4cb 100644 --- a/panda/src/cull/geomBinNormal.cxx +++ b/panda/src/cull/geomBinNormal.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBinNormal.h" #include "geomBinUnsorted.h" #include "geomBinBackToFront.h" #include -#endif #include #include diff --git a/panda/src/cull/geomBinTransition.cxx b/panda/src/cull/geomBinTransition.cxx index 90b31064d6..bd13c3acaa 100644 --- a/panda/src/cull/geomBinTransition.cxx +++ b/panda/src/cull/geomBinTransition.cxx @@ -16,20 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBinTransition.h" #include "geomBinAttribute.h" - #include - #include -#endif TypeHandle GeomBinTransition::_type_handle; diff --git a/panda/src/cull/geomBinUnsorted.cxx b/panda/src/cull/geomBinUnsorted.cxx index 9b10ac7ca7..b7a1cfa79a 100644 --- a/panda/src/cull/geomBinUnsorted.cxx +++ b/panda/src/cull/geomBinUnsorted.cxx @@ -16,21 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "cull_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "geomBinUnsorted.h" #include "cullTraverser.h" - #include #include #include #include -#endif TypeHandle GeomBinUnsorted::_type_handle; diff --git a/panda/src/device/Sources.pp b/panda/src/device/Sources.pp index d138c2ac82..2af36b5784 100644 --- a/panda/src/device/Sources.pp +++ b/panda/src/device/Sources.pp @@ -39,8 +39,6 @@ trackerData.I trackerData.h \ trackerNode.I trackerNode.h -// #define PRECOMPILED_HEADER device_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/device/analogNode.cxx b/panda/src/device/analogNode.cxx index 29c94d0831..2e28783cf7 100644 --- a/panda/src/device/analogNode.cxx +++ b/panda/src/device/analogNode.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "analogNode.h" #include "config_device.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/device/buttonNode.cxx b/panda/src/device/buttonNode.cxx index b4c7598214..419b340eae 100644 --- a/panda/src/device/buttonNode.cxx +++ b/panda/src/device/buttonNode.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "buttonNode.h" #include "config_device.h" -#endif #include diff --git a/panda/src/device/clientAnalogDevice.cxx b/panda/src/device/clientAnalogDevice.cxx index 0e576ce2a3..1d8b2fac7b 100644 --- a/panda/src/device/clientAnalogDevice.cxx +++ b/panda/src/device/clientAnalogDevice.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "clientAnalogDevice.h" #include -#endif TypeHandle ClientAnalogDevice::_type_handle; diff --git a/panda/src/device/clientBase.cxx b/panda/src/device/clientBase.cxx index 9ef16e84d5..96e8c91103 100644 --- a/panda/src/device/clientBase.cxx +++ b/panda/src/device/clientBase.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "clientBase.h" #include "config_device.h" -#endif TypeHandle ClientBase::_type_handle; diff --git a/panda/src/device/clientButtonDevice.cxx b/panda/src/device/clientButtonDevice.cxx index 0bce14ff03..3d324aa609 100644 --- a/panda/src/device/clientButtonDevice.cxx +++ b/panda/src/device/clientButtonDevice.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "clientButtonDevice.h" #include -#endif TypeHandle ClientButtonDevice::_type_handle; diff --git a/panda/src/device/clientDevice.cxx b/panda/src/device/clientDevice.cxx index de77e36733..b49fa7a789 100644 --- a/panda/src/device/clientDevice.cxx +++ b/panda/src/device/clientDevice.cxx @@ -16,18 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "clientDevice.h" #include "clientBase.h" #include -#endif TypeHandle ClientDevice::_type_handle; diff --git a/panda/src/device/clientDialDevice.cxx b/panda/src/device/clientDialDevice.cxx index f2130e59bc..83fa067825 100644 --- a/panda/src/device/clientDialDevice.cxx +++ b/panda/src/device/clientDialDevice.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "clientDialDevice.h" #include -#endif TypeHandle ClientDialDevice::_type_handle; diff --git a/panda/src/device/clientTrackerDevice.cxx b/panda/src/device/clientTrackerDevice.cxx index 9c208edcdb..a73c912912 100644 --- a/panda/src/device/clientTrackerDevice.cxx +++ b/panda/src/device/clientTrackerDevice.cxx @@ -16,14 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "clientTrackerDevice.h" -#endif TypeHandle ClientTrackerDevice::_type_handle; diff --git a/panda/src/device/config_device.cxx b/panda/src/device/config_device.cxx index 8d667dd222..e620991f3b 100644 --- a/panda/src/device/config_device.cxx +++ b/panda/src/device/config_device.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_device.h" #include "analogNode.h" #include "buttonNode.h" @@ -35,7 +29,6 @@ #include "dialNode.h" #include "mouse.h" #include "trackerNode.h" -#endif #include diff --git a/panda/src/device/dialNode.cxx b/panda/src/device/dialNode.cxx index 6a29393acb..7974641886 100644 --- a/panda/src/device/dialNode.cxx +++ b/panda/src/device/dialNode.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dialNode.h" #include "config_device.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/device/mouse.cxx b/panda/src/device/mouse.cxx index 0e698f9ccd..ba3fce6163 100644 --- a/panda/src/device/mouse.cxx +++ b/panda/src/device/mouse.cxx @@ -15,15 +15,8 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "mouse.h" -#endif #include #include diff --git a/panda/src/device/trackerData.cxx b/panda/src/device/trackerData.cxx index 71de797ba3..93fb2c9cab 100644 --- a/panda/src/device/trackerData.cxx +++ b/panda/src/device/trackerData.cxx @@ -16,12 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif - -#pragma hdrstop - #include "trackerData.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/device/trackerNode.cxx b/panda/src/device/trackerNode.cxx index 362d878567..9e1dc27252 100644 --- a/panda/src/device/trackerNode.cxx +++ b/panda/src/device/trackerNode.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "device_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "trackerNode.h" #include "config_device.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/dgraph/Sources.pp b/panda/src/dgraph/Sources.pp index 8813cd0f6b..a0e076379c 100644 --- a/panda/src/dgraph/Sources.pp +++ b/panda/src/dgraph/Sources.pp @@ -65,8 +65,6 @@ vec4DataTransition.h vectorDataAttribute.I vectorDataAttribute.h \ vectorDataTransition.I vectorDataTransition.h -// #define PRECOMPILED_HEADER dgraph_headers.h - #define IGATESCAN \ dataNode.cxx dataNode.h dataRelation.cxx dataRelation.h \ dataGraphTraversal.cxx dataGraphTraversal.h diff --git a/panda/src/dgraph/buttonEventDataAttribute.cxx b/panda/src/dgraph/buttonEventDataAttribute.cxx index 1c17a98752..2052b12a39 100644 --- a/panda/src/dgraph/buttonEventDataAttribute.cxx +++ b/panda/src/dgraph/buttonEventDataAttribute.cxx @@ -16,18 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "buttonEventDataAttribute.h" #include "buttonEventDataTransition.h" #include -#endif #include #include diff --git a/panda/src/dgraph/buttonEventDataTransition.cxx b/panda/src/dgraph/buttonEventDataTransition.cxx index 8aa3391e46..96b056af6a 100644 --- a/panda/src/dgraph/buttonEventDataTransition.cxx +++ b/panda/src/dgraph/buttonEventDataTransition.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "buttonEventDataTransition.h" #include "buttonEventDataAttribute.h" -#endif TypeHandle ButtonEventDataTransition::_type_handle; diff --git a/panda/src/dgraph/config_dgraph.cxx b/panda/src/dgraph/config_dgraph.cxx index 0493e99fd4..1aa367fdf8 100644 --- a/panda/src/dgraph/config_dgraph.cxx +++ b/panda/src/dgraph/config_dgraph.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dgraph_headers.h" #include "dataNode.h" #include "dataRelation.h" @@ -36,7 +30,6 @@ #include "matrixDataAttribute.h" #include "buttonEventDataTransition.h" #include "buttonEventDataAttribute.h" -#endif #include diff --git a/panda/src/dgraph/dataGraphTraversal.cxx b/panda/src/dgraph/dataGraphTraversal.cxx index 7d29bfb198..831b40b6cd 100644 --- a/panda/src/dgraph/dataGraphTraversal.cxx +++ b/panda/src/dgraph/dataGraphTraversal.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dataGraphTraversal.h" #include "dataGraphTraverser.h" -#endif #include #include diff --git a/panda/src/dgraph/dataGraphTraverser.cxx b/panda/src/dgraph/dataGraphTraverser.cxx index 40e9fd6e19..5d72118182 100644 --- a/panda/src/dgraph/dataGraphTraverser.cxx +++ b/panda/src/dgraph/dataGraphTraverser.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dataGraphTraverser.h" #include "dataRelation.h" #include "dataNode.h" #include "config_dgraph.h" #include "describe_data_verbose.h" -#endif diff --git a/panda/src/dgraph/dataNode.cxx b/panda/src/dgraph/dataNode.cxx index c92a0ba77e..5e804dc074 100644 --- a/panda/src/dgraph/dataNode.cxx +++ b/panda/src/dgraph/dataNode.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dataNode.h" -#endif TypeHandle DataNode::_type_handle; diff --git a/panda/src/dgraph/dataRelation.cxx b/panda/src/dgraph/dataRelation.cxx index 1a3c36dd50..27b58d8cd5 100644 --- a/panda/src/dgraph/dataRelation.cxx +++ b/panda/src/dgraph/dataRelation.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dataRelation.h" -#endif #include "transformTransition.h" diff --git a/panda/src/dgraph/describe_data_verbose.cxx b/panda/src/dgraph/describe_data_verbose.cxx index bdeade6ffd..aed183f1c8 100644 --- a/panda/src/dgraph/describe_data_verbose.cxx +++ b/panda/src/dgraph/describe_data_verbose.cxx @@ -16,18 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "dataGraphTraversal.h" #include "describe_data_verbose.h" #include -#endif #include diff --git a/panda/src/dgraph/doubleDataAttribute.cxx b/panda/src/dgraph/doubleDataAttribute.cxx index 744d7c8296..c37eb5b673 100644 --- a/panda/src/dgraph/doubleDataAttribute.cxx +++ b/panda/src/dgraph/doubleDataAttribute.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "doubleDataAttribute.h" #include "doubleDataTransition.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/doubleDataTransition.cxx b/panda/src/dgraph/doubleDataTransition.cxx index d035d658a8..2e95f7efeb 100644 --- a/panda/src/dgraph/doubleDataTransition.cxx +++ b/panda/src/dgraph/doubleDataTransition.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "doubleDataTransition.h" #include "doubleDataAttribute.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/doublePtrDataAttribute.cxx b/panda/src/dgraph/doublePtrDataAttribute.cxx index e32b1edf20..0ec157faa4 100644 --- a/panda/src/dgraph/doublePtrDataAttribute.cxx +++ b/panda/src/dgraph/doublePtrDataAttribute.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "doublePtrDataAttribute.h" #include "doublePtrDataTransition.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/doublePtrDataTransition.cxx b/panda/src/dgraph/doublePtrDataTransition.cxx index 918339b9b5..bddff08d50 100644 --- a/panda/src/dgraph/doublePtrDataTransition.cxx +++ b/panda/src/dgraph/doublePtrDataTransition.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "doublePtrDataTransition.h" #include "doublePtrDataAttribute.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/intDataAttribute.cxx b/panda/src/dgraph/intDataAttribute.cxx index 90d927a8f7..faa7443503 100644 --- a/panda/src/dgraph/intDataAttribute.cxx +++ b/panda/src/dgraph/intDataAttribute.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "intDataAttribute.h" #include "intDataTransition.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/intDataTransition.cxx b/panda/src/dgraph/intDataTransition.cxx index 9e3704da77..f0bcbc3e55 100644 --- a/panda/src/dgraph/intDataTransition.cxx +++ b/panda/src/dgraph/intDataTransition.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "intDataTransition.h" #include "intDataAttribute.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/matrixDataAttribute.cxx b/panda/src/dgraph/matrixDataAttribute.cxx index 14d664225e..3404ac02a9 100644 --- a/panda/src/dgraph/matrixDataAttribute.cxx +++ b/panda/src/dgraph/matrixDataAttribute.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "matrixDataAttribute.h" #include "matrixDataTransition.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/matrixDataTransition.cxx b/panda/src/dgraph/matrixDataTransition.cxx index b5b67af88d..345d73f003 100644 --- a/panda/src/dgraph/matrixDataTransition.cxx +++ b/panda/src/dgraph/matrixDataTransition.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "matrixDataTransition.h" #include "matrixDataAttribute.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/vec3DataAttribute.cxx b/panda/src/dgraph/vec3DataAttribute.cxx index 2b9dd5c68c..deb3a14dbf 100644 --- a/panda/src/dgraph/vec3DataAttribute.cxx +++ b/panda/src/dgraph/vec3DataAttribute.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "vec3DataAttribute.h" #include "vec3DataTransition.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/vec3DataTransition.cxx b/panda/src/dgraph/vec3DataTransition.cxx index a13be7f8b9..7c29d99de0 100644 --- a/panda/src/dgraph/vec3DataTransition.cxx +++ b/panda/src/dgraph/vec3DataTransition.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "vec3DataTransition.h" #include "vec3DataAttribute.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/vec4DataAttribute.cxx b/panda/src/dgraph/vec4DataAttribute.cxx index 71f49ca4a1..b56b798d65 100644 --- a/panda/src/dgraph/vec4DataAttribute.cxx +++ b/panda/src/dgraph/vec4DataAttribute.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "vec4DataAttribute.h" #include "vec4DataTransition.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/dgraph/vec4DataTransition.cxx b/panda/src/dgraph/vec4DataTransition.cxx index cfc387a9ac..ed19176f77 100644 --- a/panda/src/dgraph/vec4DataTransition.cxx +++ b/panda/src/dgraph/vec4DataTransition.cxx @@ -16,16 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "dgraph_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "vec4DataTransition.h" #include "vec4DataAttribute.h" -#endif // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp index 0359af3bcd..55c97c6944 100644 --- a/panda/src/display/Sources.pp +++ b/panda/src/display/Sources.pp @@ -45,8 +45,6 @@ savedFrameBuffer.I savedFrameBuffer.h textureContext.I \ textureContext.h -// #define PRECOMPILED_HEADER display_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx index 45f2ab9c7f..27c25ad6f0 100644 --- a/panda/src/display/config_display.cxx +++ b/panda/src/display/config_display.cxx @@ -16,13 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_display.h" #include "graphicsStateGuardian.h" #include "savedFrameBuffer.h" @@ -33,7 +27,6 @@ #include "graphicsChannel.h" #include "hardwareChannel.h" #include "textureContext.h" -#endif Configure(config_display); NotifyCategoryDef(display, ""); diff --git a/panda/src/display/displayRegion.cxx b/panda/src/display/displayRegion.cxx index e2430dc174..c5c74e81dc 100644 --- a/panda/src/display/displayRegion.cxx +++ b/panda/src/display/displayRegion.cxx @@ -16,18 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "graphicsLayer.h" #include "graphicsChannel.h" #include "graphicsWindow.h" #include "config_display.h" -#endif #include "displayRegion.h" diff --git a/panda/src/display/graphicsChannel.cxx b/panda/src/display/graphicsChannel.cxx index 707c424c0d..a2716e6472 100644 --- a/panda/src/display/graphicsChannel.cxx +++ b/panda/src/display/graphicsChannel.cxx @@ -15,19 +15,12 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "graphicsChannel.h" #include "graphicsWindow.h" #include "config_display.h" #include "pmap.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/display/graphicsLayer.cxx b/panda/src/display/graphicsLayer.cxx index 7d6e7cf1ac..50ba7ac2a3 100644 --- a/panda/src/display/graphicsLayer.cxx +++ b/panda/src/display/graphicsLayer.cxx @@ -15,20 +15,13 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "graphicsLayer.h" #include "graphicsChannel.h" #include "graphicsWindow.h" #include "config_display.h" #include -#endif #include diff --git a/panda/src/display/graphicsPipe.cxx b/panda/src/display/graphicsPipe.cxx index cc2dd94c51..a83f048160 100644 --- a/panda/src/display/graphicsPipe.cxx +++ b/panda/src/display/graphicsPipe.cxx @@ -15,18 +15,11 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "graphicsPipe.h" #include "config_display.h" #include -#endif #include #include diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx index 90a6791c6d..286f555ab7 100644 --- a/panda/src/display/graphicsStateGuardian.cxx +++ b/panda/src/display/graphicsStateGuardian.cxx @@ -16,18 +16,11 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "graphicsStateGuardian.h" #include "config_display.h" #include "textureContext.h" #include -#endif #include #include diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx index 61973bf952..464ab00bab 100644 --- a/panda/src/display/graphicsWindow.cxx +++ b/panda/src/display/graphicsWindow.cxx @@ -15,13 +15,7 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "graphicsWindow.h" #include "graphicsPipe.h" #include "config_display.h" @@ -30,7 +24,6 @@ #include #include "pmap.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/display/graphicsWindowInputDevice.cxx b/panda/src/display/graphicsWindowInputDevice.cxx index 51977566a9..f24c65e3a9 100644 --- a/panda/src/display/graphicsWindowInputDevice.cxx +++ b/panda/src/display/graphicsWindowInputDevice.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "graphicsWindowInputDevice.h" #include #include -#endif #define EXPCL EXPCL_PANDA #define EXPTP EXPTP_PANDA diff --git a/panda/src/display/hardwareChannel.cxx b/panda/src/display/hardwareChannel.cxx index 710b43db66..31948cc6bf 100644 --- a/panda/src/display/hardwareChannel.cxx +++ b/panda/src/display/hardwareChannel.cxx @@ -15,16 +15,9 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "hardwareChannel.h" #include "config_display.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/display/interactiveGraphicsPipe.cxx b/panda/src/display/interactiveGraphicsPipe.cxx index 6c9c7d210f..0f54092e17 100644 --- a/panda/src/display/interactiveGraphicsPipe.cxx +++ b/panda/src/display/interactiveGraphicsPipe.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "interactiveGraphicsPipe.h" #include "config_display.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/display/noninteractiveGraphicsPipe.cxx b/panda/src/display/noninteractiveGraphicsPipe.cxx index 2d55931e0f..885f90e974 100644 --- a/panda/src/display/noninteractiveGraphicsPipe.cxx +++ b/panda/src/display/noninteractiveGraphicsPipe.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "noninteractiveGraphicsPipe.h" #include "config_display.h" -#endif //////////////////////////////////////////////////////////////////// // Static variables diff --git a/panda/src/display/pipeSpec.cxx b/panda/src/display/pipeSpec.cxx index c62a7f36e8..4673560f8e 100644 --- a/panda/src/display/pipeSpec.cxx +++ b/panda/src/display/pipeSpec.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_display.h" -#endif #include "pipeSpec.h" diff --git a/panda/src/display/savedFrameBuffer.cxx b/panda/src/display/savedFrameBuffer.cxx index d196d00783..4a368d95ab 100644 --- a/panda/src/display/savedFrameBuffer.cxx +++ b/panda/src/display/savedFrameBuffer.cxx @@ -16,14 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "savedFrameBuffer.h" -#endif TypeHandle SavedFrameBuffer::_type_handle; diff --git a/panda/src/display/textureContext.cxx b/panda/src/display/textureContext.cxx index ca18f572c5..171e1b1924 100644 --- a/panda/src/display/textureContext.cxx +++ b/panda/src/display/textureContext.cxx @@ -16,15 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "display_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "textureContext.h" -#endif #include #include diff --git a/panda/src/express/Sources.pp b/panda/src/express/Sources.pp index 1e17cb2f98..5dc36f923f 100644 --- a/panda/src/express/Sources.pp +++ b/panda/src/express/Sources.pp @@ -78,8 +78,6 @@ namable.I namable.h tokenBoard.I patchfile.h patchfile.I \ error_utils.h -// #define PRECOMPILED_HEADER express_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/express/buffer.cxx b/panda/src/express/buffer.cxx index 2d663a1303..33c4e96788 100644 --- a/panda/src/express/buffer.cxx +++ b/panda/src/express/buffer.cxx @@ -15,12 +15,6 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif - -#pragma hdrstop - #include "buffer.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/express/clockObject.cxx b/panda/src/express/clockObject.cxx index 9ed64c7b60..dae16fdc41 100644 --- a/panda/src/express/clockObject.cxx +++ b/panda/src/express/clockObject.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "clockObject.h" -#endif ClockObject *ClockObject::_global_clock = (ClockObject *)NULL; diff --git a/panda/src/express/config_express.cxx b/panda/src/express/config_express.cxx index 56266b7cc1..6e4768352f 100644 --- a/panda/src/express/config_express.cxx +++ b/panda/src/express/config_express.cxx @@ -16,20 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_express.h" #include "clockObject.h" #include "typedObject.h" #include "referenceCount.h" #include "typedReferenceCount.h" #include "datagram.h" -#endif #include diff --git a/panda/src/express/crypto_utils.cxx b/panda/src/express/crypto_utils.cxx index a459d0563b..1b56bb4d25 100644 --- a/panda/src/express/crypto_utils.cxx +++ b/panda/src/express/crypto_utils.cxx @@ -18,15 +18,8 @@ // This file is compiled only if we have crypto++ installed. -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "hashVal.h" -#endif #include "crypto_utils.h" #include diff --git a/panda/src/express/datagram.cxx b/panda/src/express/datagram.cxx index 1f1cdd7f53..a15f6220da 100644 --- a/panda/src/express/datagram.cxx +++ b/panda/src/express/datagram.cxx @@ -16,20 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "datagram.h" #include // for sprintf(). #include -#endif TypeHandle Datagram::_type_handle; diff --git a/panda/src/express/datagramGenerator.cxx b/panda/src/express/datagramGenerator.cxx index 48eee1930e..cca3a7ba1e 100644 --- a/panda/src/express/datagramGenerator.cxx +++ b/panda/src/express/datagramGenerator.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include -#endif #include "datagramGenerator.h" diff --git a/panda/src/express/datagramInputFile.cxx b/panda/src/express/datagramInputFile.cxx index 61a199822e..7af60ae324 100644 --- a/panda/src/express/datagramInputFile.cxx +++ b/panda/src/express/datagramInputFile.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "numeric_types.h" #include "datagramIterator.h" #include "profileTimer.h" -#endif #include "datagramInputFile.h" diff --git a/panda/src/express/datagramIterator.cxx b/panda/src/express/datagramIterator.cxx index f44c97ba63..8a94a85ec8 100644 --- a/panda/src/express/datagramIterator.cxx +++ b/panda/src/express/datagramIterator.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "datagramIterator.h" #include -#endif //////////////////////////////////////////////////////////////////// // Function: DatagramIterator::get_string diff --git a/panda/src/express/datagramOutputFile.cxx b/panda/src/express/datagramOutputFile.cxx index 088f8e7584..2936f92533 100644 --- a/panda/src/express/datagramOutputFile.cxx +++ b/panda/src/express/datagramOutputFile.cxx @@ -16,12 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif - -#pragma hdrstop - #include "datagramOutputFile.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/express/datagramSink.cxx b/panda/src/express/datagramSink.cxx index a6820440d5..a3ae7a84c4 100644 --- a/panda/src/express/datagramSink.cxx +++ b/panda/src/express/datagramSink.cxx @@ -16,12 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif - -#pragma hdrstop - #include "datagramSink.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/express/error_utils.cxx b/panda/src/express/error_utils.cxx index 86e5d4ea1b..09078203c0 100644 --- a/panda/src/express/error_utils.cxx +++ b/panda/src/express/error_utils.cxx @@ -16,19 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "error_utils.h" #include "config_express.h" #include #include -#endif #if defined(WIN32_VC) #include diff --git a/panda/src/express/get_config_path.cxx b/panda/src/express/get_config_path.cxx index fc30fc7a88..0934b790d8 100644 --- a/panda/src/express/get_config_path.cxx +++ b/panda/src/express/get_config_path.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_express.h" -#endif #include #include "get_config_path.h" diff --git a/panda/src/express/hashVal.cxx b/panda/src/express/hashVal.cxx index 7dc142a1c9..fc8ddab1dc 100644 --- a/panda/src/express/hashVal.cxx +++ b/panda/src/express/hashVal.cxx @@ -16,13 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "hashVal.h" -#endif diff --git a/panda/src/express/indent.cxx b/panda/src/express/indent.cxx index ba452d5c40..22cac2af6b 100644 --- a/panda/src/express/indent.cxx +++ b/panda/src/express/indent.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "indent.h" -#endif //////////////////////////////////////////////////////////////////// // Function: indent diff --git a/panda/src/express/memoryUsage.cxx b/panda/src/express/memoryUsage.cxx index 4e717f820e..6d1d48d655 100644 --- a/panda/src/express/memoryUsage.cxx +++ b/panda/src/express/memoryUsage.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "memoryUsagePointers.h" #include "trueClock.h" #include "typedReferenceCount.h" -#endif #include "memoryUsage.h" #include "interrogate_request.h" @@ -38,10 +31,9 @@ #ifndef NDEBUG // Nothing in this module gets compiled in NDEBUG mode. -#if !defined(WIN32_VC) || defined(NO_PCH) + #include "config_express.h" #include -#endif // This flag is set true in is_counting() mode to indicate that the // malloc operation is coming from C++ operator new or delete. diff --git a/panda/src/express/memoryUsagePointers.cxx b/panda/src/express/memoryUsagePointers.cxx index f091848031..ed900ee2b2 100644 --- a/panda/src/express/memoryUsagePointers.cxx +++ b/panda/src/express/memoryUsagePointers.cxx @@ -16,31 +16,17 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "memoryUsagePointers.h" -#endif #ifndef NDEBUG // Nothing in this module gets compiled in NDEBUG mode. -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_express.h" #include "referenceCount.h" #include "typedReferenceCount.h" -#endif //////////////////////////////////////////////////////////////////// // Function: MemoryUsagePointers::Constructor diff --git a/panda/src/express/multifile.cxx b/panda/src/express/multifile.cxx index 2cbc00bfde..67bcfb8df5 100644 --- a/panda/src/express/multifile.cxx +++ b/panda/src/express/multifile.cxx @@ -15,20 +15,13 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include #include "config_express.h" #include "error_utils.h" #include #include -#endif #include "multifile.h" diff --git a/panda/src/express/namable.cxx b/panda/src/express/namable.cxx index a6bd0cb5a6..dcfd9664b9 100644 --- a/panda/src/express/namable.cxx +++ b/panda/src/express/namable.cxx @@ -16,12 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif - -#pragma hdrstop - #include "namable.h" TypeHandle Namable::_type_handle; diff --git a/panda/src/express/patchfile.cxx b/panda/src/express/patchfile.cxx index a0d0044e30..f1048017f8 100644 --- a/panda/src/express/patchfile.cxx +++ b/panda/src/express/patchfile.cxx @@ -15,17 +15,10 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_express.h" #include "error_utils.h" #include // for tempnam -#endif #include "patchfile.h" #include "crypto_utils.h" // MD5 stuff diff --git a/panda/src/express/profileTimer.cxx b/panda/src/express/profileTimer.cxx index c129e74ea1..b7762f4b1b 100644 --- a/panda/src/express/profileTimer.cxx +++ b/panda/src/express/profileTimer.cxx @@ -15,15 +15,8 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "profileTimer.h" -#endif #include "pmap.h" diff --git a/panda/src/express/referenceCount.cxx b/panda/src/express/referenceCount.cxx index 5f2d78ef60..e39372e1a6 100644 --- a/panda/src/express/referenceCount.cxx +++ b/panda/src/express/referenceCount.cxx @@ -16,14 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "referenceCount.h" -#endif TypeHandle ReferenceCount::_type_handle; diff --git a/panda/src/express/reversedNumericData.cxx b/panda/src/express/reversedNumericData.cxx index c7337ebe01..004924ae73 100644 --- a/panda/src/express/reversedNumericData.cxx +++ b/panda/src/express/reversedNumericData.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include -#endif #include "reversedNumericData.h" diff --git a/panda/src/express/trueClock.cxx b/panda/src/express/trueClock.cxx index 9a53470cc1..21a84708f1 100644 --- a/panda/src/express/trueClock.cxx +++ b/panda/src/express/trueClock.cxx @@ -16,17 +16,10 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "trueClock.h" #include "config_express.h" #include "numeric_types.h" -#endif TrueClock *TrueClock::_global_ptr = NULL; @@ -111,16 +104,9 @@ TrueClock() { // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include #include -#endif static unsigned int _msec; static unsigned int _sec; diff --git a/panda/src/express/typeHandle.cxx b/panda/src/express/typeHandle.cxx index ea8af323ab..04dde372a9 100644 --- a/panda/src/express/typeHandle.cxx +++ b/panda/src/express/typeHandle.cxx @@ -16,20 +16,12 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "typeHandle.h" #include "typedObject.h" #include "indent.h" #include "config_express.h" #include -#endif // In general, we use the express_cat->info() syntax in this file // (instead of express_cat.info()), because much of this work is done at diff --git a/panda/src/express/typedReferenceCount.cxx b/panda/src/express/typedReferenceCount.cxx index f2648ee8e4..ef298434b4 100644 --- a/panda/src/express/typedReferenceCount.cxx +++ b/panda/src/express/typedReferenceCount.cxx @@ -16,14 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "express_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "typedReferenceCount.h" -#endif TypeHandle TypedReferenceCount::_type_handle; diff --git a/panda/src/lerp/Sources.pp b/panda/src/lerp/Sources.pp index c6f3c4ba88..4e106858f1 100644 --- a/panda/src/lerp/Sources.pp +++ b/panda/src/lerp/Sources.pp @@ -17,8 +17,6 @@ #define INSTALL_HEADERS \ lerp.h lerpblend.h lerpfunctor.h -// #define PRECOMPILED_HEADER lerp_headers.h - #define IGATESCAN all #end lib_target diff --git a/panda/src/lerp/config_lerp.cxx b/panda/src/lerp/config_lerp.cxx index a8f992a967..12581e017e 100644 --- a/panda/src/lerp/config_lerp.cxx +++ b/panda/src/lerp/config_lerp.cxx @@ -16,16 +16,9 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "lerp_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "lerp.h" #include "lerpfunctor.h" -#endif #include "config_lerp.h" diff --git a/panda/src/lerp/lerp.cxx b/panda/src/lerp/lerp.cxx index 38612b620a..b74e45bd5a 100644 --- a/panda/src/lerp/lerp.cxx +++ b/panda/src/lerp/lerp.cxx @@ -16,15 +16,8 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "lerp_headers.h" -#endif -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "lerp.h" -#endif #include #include diff --git a/panda/src/lerp/lerpblend.cxx b/panda/src/lerp/lerpblend.cxx index 7a1eb10507..98e568334a 100644 --- a/panda/src/lerp/lerpblend.cxx +++ b/panda/src/lerp/lerpblend.cxx @@ -16,12 +16,6 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "lerp_headers.h" -#endif - -#pragma hdrstop - #include "lerpblend.h" TypeHandle LerpBlendType::_type_handle; diff --git a/panda/src/lerp/lerpfunctor.cxx b/panda/src/lerp/lerpfunctor.cxx index a90205f505..7623f12ef0 100644 --- a/panda/src/lerp/lerpfunctor.cxx +++ b/panda/src/lerp/lerpfunctor.cxx @@ -16,15 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#if defined(WIN32_VC) && !defined(NO_PCH) -#include "lerp_headers.h" -#endif - -#pragma hdrstop - -#if !defined(WIN32_VC) || defined(NO_PCH) #include "lerpfunctor.h" -#endif TypeHandle LerpFunctor::_type_handle; TypeHandle MultiLerpFunctor::_type_handle; diff --git a/panda/src/sgattrib/Sources.pp b/panda/src/sgattrib/Sources.pp index 81d356b068..42339c8aa7 100644 --- a/panda/src/sgattrib/Sources.pp +++ b/panda/src/sgattrib/Sources.pp @@ -147,8 +147,7 @@ #define IGATESCAN all -// #define PRECOMPILED_HEADER sgattrib_headers.h -// + // #define IGATESCAN \ // renderRelation.cxx textureTransition.cxx materialTransition.cxx \ // clipPlaneTransition.cxx linesmoothTransition.cxx transformTransition.cxx \