diff --git a/panda/src/chan/animBundle.cxx b/panda/src/chan/animBundle.cxx index cf0e9227eb..6b62f70b8e 100644 --- a/panda/src/chan/animBundle.cxx +++ b/panda/src/chan/animBundle.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animBundle.h" #include diff --git a/panda/src/chan/animBundleNode.cxx b/panda/src/chan/animBundleNode.cxx index 66f11bed63..56bbbe4eb1 100644 --- a/panda/src/chan/animBundleNode.cxx +++ b/panda/src/chan/animBundleNode.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animBundleNode.h" #include #include diff --git a/panda/src/chan/animChannel.cxx b/panda/src/chan/animChannel.cxx index 0592716589..188f66a73f 100644 --- a/panda/src/chan/animChannel.cxx +++ b/panda/src/chan/animChannel.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannel.h" #include diff --git a/panda/src/chan/animChannelBase.cxx b/panda/src/chan/animChannelBase.cxx index a00146346f..c01b5c61df 100644 --- a/panda/src/chan/animChannelBase.cxx +++ b/panda/src/chan/animChannelBase.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannelBase.h" #include #include diff --git a/panda/src/chan/animChannelMatrixXfmTable.cxx b/panda/src/chan/animChannelMatrixXfmTable.cxx index a67dead513..b9b6eb8de9 100644 --- a/panda/src/chan/animChannelMatrixXfmTable.cxx +++ b/panda/src/chan/animChannelMatrixXfmTable.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannelMatrixXfmTable.h" #include "animBundle.h" #include "config_chan.h" diff --git a/panda/src/chan/animChannelScalarTable.cxx b/panda/src/chan/animChannelScalarTable.cxx index b866275f9f..b2b793c68f 100644 --- a/panda/src/chan/animChannelScalarTable.cxx +++ b/panda/src/chan/animChannelScalarTable.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animChannelScalarTable.h" #include "animBundle.h" #include "config_chan.h" diff --git a/panda/src/chan/animControl.cxx b/panda/src/chan/animControl.cxx index fabfad0a85..514b9508d3 100644 --- a/panda/src/chan/animControl.cxx +++ b/panda/src/chan/animControl.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animControl.h" #include "animChannelBase.h" #include "partBundle.h" @@ -548,7 +548,7 @@ bool AnimControl:: do_actions_backward(int from, int to) { #ifndef WIN32_VC if (from >= to) { -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) typedef reverse_iterator Action_reverse_iterator; #else typedef reverse_iterator Action_reverse_iterator; diff --git a/panda/src/chan/animControlCollection.cxx b/panda/src/chan/animControlCollection.cxx index ceee71b06f..7f7222e03b 100644 --- a/panda/src/chan/animControlCollection.cxx +++ b/panda/src/chan/animControlCollection.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#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 99be8b481f..31dd3fde59 100644 --- a/panda/src/chan/animGroup.cxx +++ b/panda/src/chan/animGroup.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animGroup.h" #include "animBundle.h" #include "config_chan.h" diff --git a/panda/src/chan/auto_bind.cxx b/panda/src/chan/auto_bind.cxx index 78189ab6a7..607a086824 100644 --- a/panda/src/chan/auto_bind.cxx +++ b/panda/src/chan/auto_bind.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "animBundleNode.h" #include "partBundleNode.h" #include "config_chan.h" diff --git a/panda/src/chan/config_chan.cxx b/panda/src/chan/config_chan.cxx index c3c7b79e08..25d657b7e2 100644 --- a/panda/src/chan/config_chan.cxx +++ b/panda/src/chan/config_chan.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_chan.h" #include "animBundle.h" #include "animBundleNode.h" diff --git a/panda/src/chan/movingPartBase.cxx b/panda/src/chan/movingPartBase.cxx index c21d0d9396..3bf43dfae4 100644 --- a/panda/src/chan/movingPartBase.cxx +++ b/panda/src/chan/movingPartBase.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "movingPartBase.h" #include "animControl.h" #include "animChannelBase.h" diff --git a/panda/src/chan/movingPartMatrix.cxx b/panda/src/chan/movingPartMatrix.cxx index b3adbc0e0f..844a6d2d20 100644 --- a/panda/src/chan/movingPartMatrix.cxx +++ b/panda/src/chan/movingPartMatrix.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "movingPartMatrix.h" #include diff --git a/panda/src/chan/movingPartScalar.cxx b/panda/src/chan/movingPartScalar.cxx index a65167fd18..030d55c203 100644 --- a/panda/src/chan/movingPartScalar.cxx +++ b/panda/src/chan/movingPartScalar.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "movingPartScalar.h" #include #include diff --git a/panda/src/chan/partBundle.cxx b/panda/src/chan/partBundle.cxx index aaac62deaa..d49893dda3 100644 --- a/panda/src/chan/partBundle.cxx +++ b/panda/src/chan/partBundle.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "partBundle.h" #include "animBundle.h" #include "animControl.h" diff --git a/panda/src/chan/partBundleNode.cxx b/panda/src/chan/partBundleNode.cxx index aba32108c4..463c8ce673 100644 --- a/panda/src/chan/partBundleNode.cxx +++ b/panda/src/chan/partBundleNode.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "partBundleNode.h" #include #include diff --git a/panda/src/chan/partGroup.cxx b/panda/src/chan/partGroup.cxx index c0087fdead..4e397baefa 100644 --- a/panda/src/chan/partGroup.cxx +++ b/panda/src/chan/partGroup.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chan_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "partGroup.h" #include "animGroup.h" #include "config_chan.h" diff --git a/panda/src/chancfg/chancfg.cxx b/panda/src/chancfg/chancfg.cxx index 55ec2d9c0a..1b6cd7d152 100644 --- a/panda/src/chancfg/chancfg.cxx +++ b/panda/src/chancfg/chancfg.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chancfg_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "chancfg.h" #include #endif diff --git a/panda/src/chancfg/chanlayout.cxx b/panda/src/chancfg/chanlayout.cxx index bdf3f4a458..d53c0f643e 100644 --- a/panda/src/chancfg/chanlayout.cxx +++ b/panda/src/chancfg/chanlayout.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chancfg_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "chanlayout.h" #include "chanparse.h" #include "chanshare.h" diff --git a/panda/src/chancfg/chanparse.cxx b/panda/src/chancfg/chanparse.cxx index 099bef6fc9..44b32774a4 100644 --- a/panda/src/chancfg/chanparse.cxx +++ b/panda/src/chancfg/chanparse.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chancfg_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "chanparse.h" #include diff --git a/panda/src/chancfg/chansetup.cxx b/panda/src/chancfg/chansetup.cxx index 40600eb331..8f5c8d7ea9 100644 --- a/panda/src/chancfg/chansetup.cxx +++ b/panda/src/chancfg/chansetup.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chancfg_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "chansetup.h" #include "chanparse.h" #include "chanshare.h" diff --git a/panda/src/chancfg/chanwindow.cxx b/panda/src/chancfg/chanwindow.cxx index 7291713ad4..16bde965cf 100644 --- a/panda/src/chancfg/chanwindow.cxx +++ b/panda/src/chancfg/chanwindow.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chancfg_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "chanwindow.h" #include "chanparse.h" #include "chanshare.h" diff --git a/panda/src/char/character.cxx b/panda/src/char/character.cxx index 323eac64fa..7c7db8d639 100644 --- a/panda/src/char/character.cxx +++ b/panda/src/char/character.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "character.h" #include "characterJoint.h" #include "computedVertices.h" diff --git a/panda/src/char/characterJoint.cxx b/panda/src/char/characterJoint.cxx index 30c18cd65a..ae7d16faba 100644 --- a/panda/src/char/characterJoint.cxx +++ b/panda/src/char/characterJoint.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "characterJoint.h" #include "config_char.h" diff --git a/panda/src/char/characterJointBundle.cxx b/panda/src/char/characterJointBundle.cxx index 1cec4f3d81..e888947924 100644 --- a/panda/src/char/characterJointBundle.cxx +++ b/panda/src/char/characterJointBundle.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "characterJointBundle.h" #include "character.h" #include diff --git a/panda/src/char/characterSlider.cxx b/panda/src/char/characterSlider.cxx index 3909902d8a..1a62720f48 100644 --- a/panda/src/char/characterSlider.cxx +++ b/panda/src/char/characterSlider.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "characterSlider.h" #include #include diff --git a/panda/src/char/computedVertices.cxx b/panda/src/char/computedVertices.cxx index 9c679ce090..fe59eb2a6a 100644 --- a/panda/src/char/computedVertices.cxx +++ b/panda/src/char/computedVertices.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "computedVertices.h" #include "characterJoint.h" #include "character.h" diff --git a/panda/src/char/computedVerticesMorph.cxx b/panda/src/char/computedVerticesMorph.cxx index 7e4588ed42..c518aeb7b3 100644 --- a/panda/src/char/computedVerticesMorph.cxx +++ b/panda/src/char/computedVerticesMorph.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "computedVerticesMorph.h" #include diff --git a/panda/src/char/config_char.cxx b/panda/src/char/config_char.cxx index 4f5e9a4731..3238d76eb0 100644 --- a/panda/src/char/config_char.cxx +++ b/panda/src/char/config_char.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "config_char.h" #include "character.h" #include "characterJoint.h" diff --git a/panda/src/char/dynamicVertices.cxx b/panda/src/char/dynamicVertices.cxx index 7a24925de9..4a91a87777 100644 --- a/panda/src/char/dynamicVertices.cxx +++ b/panda/src/char/dynamicVertices.cxx @@ -16,13 +16,13 @@ // //////////////////////////////////////////////////////////////////// -#ifdef WIN32_VC +#if defined(WIN32_VC) && !defined(NO_PCH) #include "char_headers.h" #endif #pragma hdrstop -#ifndef WIN32_VC +#if !defined(WIN32_VC) || defined(NO_PCH) #include "dynamicVertices.h" #include "config_char.h" #include diff --git a/panda/src/chat/chatHelpers.cxx b/panda/src/chat/chatHelpers.cxx index 6047d16ca8..7ecc7c6a1d 100644 --- a/panda/src/chat/chatHelpers.cxx +++ b/panda/src/chat/chatHelpers.cxx @@ -15,9 +15,14 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chat_headers.h" +#endif + #pragma hdrstop +#include "chatHelpers.h" + //////////////////////////////////////////////////////////////////// // Function: add_line_wraps // Description: Take an input string and format it so that lines diff --git a/panda/src/chat/chatInput.cxx b/panda/src/chat/chatInput.cxx index b2647d9d8c..9c9387c1ed 100644 --- a/panda/src/chat/chatInput.cxx +++ b/panda/src/chat/chatInput.cxx @@ -15,9 +15,20 @@ // panda3d@yahoogroups.com . // //////////////////////////////////////////////////////////////////// +#if defined(WIN32_VC) && !defined(NO_PCH) #include "chat_headers.h" +#endif + #pragma hdrstop +#include "chatInput.h" + +#include +#include +#include +#include +#include + //////////////////////////////////////////////////////////////////// // Static variables //////////////////////////////////////////////////////////////////// diff --git a/panda/src/chat/chat_headers.h b/panda/src/chat/chat_headers.h index f1fcd3915a..6c075796ab 100644 --- a/panda/src/chat/chat_headers.h +++ b/panda/src/chat/chat_headers.h @@ -16,15 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include "chatHelpers.h" -#include "chatInput.h" -#include "config_chat.h" +#include #pragma hdrstop diff --git a/panda/src/chat/config_chat.cxx b/panda/src/chat/config_chat.cxx index fcc0559b53..fd5e411218 100644 --- a/panda/src/chat/config_chat.cxx +++ b/panda/src/chat/config_chat.cxx @@ -16,9 +16,19 @@ // //////////////////////////////////////////////////////////////////// +#ifdef WIN32_VC #include "chat_headers.h" +#endif + #pragma hdrstop +#ifndef WIN32_VC +#include "chatInput.h" +#endif + +#include "config_chat.h" +#include + Configure(config_chat); NotifyCategoryDef(chat, "");