Browse Source

use precomp hdrs

cxgeorge 24 years ago
parent
commit
c48590e5db

+ 36 - 34
panda/src/express/Sources.pp

@@ -8,69 +8,71 @@
   #define USE_CRYPTO yes
   #define USE_NET yes
 
-  #define SOURCES							\
-    bigEndian.h buffer.I buffer.cxx buffer.h	\
+  #define SOURCES                           \
+    bigEndian.h buffer.I buffer.cxx buffer.h    \
     checksumHashGenerator.I checksumHashGenerator.cxx \
     checksumHashGenerator.h \
-    circBuffer.I circBuffer.h clockObject.I clockObject.cxx		\
-    clockObject.h config_express.cxx config_express.h datagram.I	\
-    datagram.cxx datagram.h datagramGenerator.I datagramGenerator.cxx	\
-    datagramGenerator.h datagramInputFile.I datagramInputFile.h		\
+    circBuffer.I circBuffer.h clockObject.I clockObject.cxx     \
+    clockObject.h config_express.cxx config_express.h datagram.I    \
+    datagram.cxx datagram.h datagramGenerator.I datagramGenerator.cxx   \
+    datagramGenerator.h datagramInputFile.I datagramInputFile.h     \
     datagramInputFile.cxx datagramIterator.I \
-    datagramIterator.cxx datagramIterator.h	\
-    datagramOutputFile.I datagramOutputFile.h datagramOutputFile.cxx	\
-    datagramSink.I datagramSink.cxx datagramSink.h			\
-    get_config_path.cxx get_config_path.h				\
+    datagramIterator.cxx datagramIterator.h \
+    datagramOutputFile.I datagramOutputFile.h datagramOutputFile.cxx    \
+    datagramSink.I datagramSink.cxx datagramSink.h          \
+    get_config_path.cxx get_config_path.h               \
     hashGeneratorBase.I hashGeneratorBase.cxx hashGeneratorBase.h \
     hashVal.I hashVal.cxx hashVal.h \
     indent.I indent.cxx indent.h \
-    littleEndian.h memoryUsage.I memoryUsage.cxx	\
-    memoryUsage.h memoryUsagePointers.I memoryUsagePointers.cxx		\
+    littleEndian.h memoryUsage.I memoryUsage.cxx    \
+    memoryUsage.h memoryUsagePointers.I memoryUsagePointers.cxx     \
     memoryUsagePointers.h multifile.I multifile.cxx multifile.h \
     namable.I namable.cxx namable.h \
     nativeNumericData.I nativeNumericData.cxx nativeNumericData.h \
-    numeric_types.h 			\
-    pointerTo.I pointerTo.h referenceCount.I	\
-    profileTimer.I profileTimer.cxx profileTimer.h	\
+    numeric_types.h             \
+    pointerTo.I pointerTo.h referenceCount.I    \
+    profileTimer.I profileTimer.cxx profileTimer.h  \
     referenceCount.cxx referenceCount.h \
     reversedNumericData.I reversedNumericData.cxx reversedNumericData.h \
-    tokenBoard.I tokenBoard.h	\
-    trueClock.I trueClock.cxx trueClock.h typeHandle.I typeHandle.cxx	\
+    tokenBoard.I tokenBoard.h   \
+    trueClock.I trueClock.cxx trueClock.h typeHandle.I typeHandle.cxx   \
     typeHandle.h \
     typedObject.I typedObject.cxx typedObject.h \
-    typedReferenceCount.I typedReferenceCount.cxx		\
+    typedReferenceCount.I typedReferenceCount.cxx       \
     typedReferenceCount.h typedef.h error_utils.cxx error_utils.h
 
-  #define IF_CRYPTO_SOURCES 						\
+  #define IF_CRYPTO_SOURCES                         \
     crypto_utils.cxx crypto_utils.h \
     patchfile.I patchfile.cxx patchfile.h
 
-  #define INSTALL_HEADERS						\
+  #define INSTALL_HEADERS                       \
     bigEndian.h buffer.I buffer.h \
     checksumHashGenerator.I checksumHashGenerator.h \
-    circBuffer.I		\
-    circBuffer.h clockObject.I clockObject.h config_express.h		\
-    datagram.I datagram.h datagramInputFile.I datagramInputFile.h	\
+    circBuffer.I        \
+    circBuffer.h clockObject.I clockObject.h config_express.h       \
+    datagram.I datagram.h datagramInputFile.I datagramInputFile.h   \
     datagramIterator.I datagramIterator.h \
-    datagramOutputFile.I datagramOutputFile.h	\
-    datagramSink.I datagramSink.h datagramGenerator.I			\
-    datagramGenerator.h get_config_path.h				\
+    datagramOutputFile.I datagramOutputFile.h   \
+    datagramSink.I datagramSink.h datagramGenerator.I           \
+    datagramGenerator.h get_config_path.h               \
     hashGeneratorBase.I hashGeneratorBase.h \
     hashVal.I hashVal.h \
-    indent.I indent.h littleEndian.h			\
-    memoryUsage.I memoryUsage.h memoryUsagePointers.I			\
+    indent.I indent.h littleEndian.h            \
+    memoryUsage.I memoryUsage.h memoryUsagePointers.I           \
     memoryUsagePointers.h multifile.I multifile.h \
     nativeNumericData.I nativeNumericData.h \
-    numeric_types.h	\
-    pointerTo.I pointerTo.h referenceCount.I referenceCount.h		\
-    profileTimer.I profileTimer.h	\
+    numeric_types.h \
+    pointerTo.I pointerTo.h referenceCount.I referenceCount.h       \
+    profileTimer.I profileTimer.h   \
     reversedNumericData.I reversedNumericData.h \
-    tokenBoard.h trueClock.I trueClock.h typeHandle.I typeHandle.h	\
+    tokenBoard.h trueClock.I trueClock.h typeHandle.I typeHandle.h  \
     typedObject.h typedObject.I \
-    typedReferenceCount.I typedReferenceCount.h typedef.h		\
-    namable.I namable.h tokenBoard.I patchfile.h patchfile.I		\
+    typedReferenceCount.I typedReferenceCount.h typedef.h       \
+    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

+ 6 - 0
panda/src/express/buffer.cxx

@@ -15,6 +15,12 @@
 // [email protected] .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
+
 #include "buffer.h"
 
 ////////////////////////////////////////////////////////////////////

+ 0 - 1
panda/src/express/checksumHashGenerator.cxx

@@ -16,7 +16,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
 #include "checksumHashGenerator.h"
 
 ////////////////////////////////////////////////////////////////////

+ 8 - 0
panda/src/express/clockObject.cxx

@@ -16,7 +16,15 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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;
 

+ 8 - 0
panda/src/express/config_express.cxx

@@ -16,12 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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 <dconfig.h>
 

+ 9 - 2
panda/src/express/crypto_utils.cxx

@@ -18,13 +18,20 @@
 
 // This file is compiled only if we have crypto++ installed.
 
-#include "crypto_utils.h"
+#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 <md5.h>
 #include <hex.h>
 #include <files.h>
-
 #include <string>
 
 USING_NAMESPACE(CryptoPP);

+ 10 - 1
panda/src/express/datagram.cxx

@@ -16,11 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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 <notify.h>
 
-#include <stdio.h>  // for sprintf().
+// for sprintf().
+#include <stdio.h>  
+#endif
 
 TypeHandle Datagram::_type_handle;
 

+ 8 - 0
panda/src/express/datagramGenerator.cxx

@@ -16,7 +16,15 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include <pandabase.h>
+#endif
 
 #include "datagramGenerator.h"
 

+ 11 - 1
panda/src/express/datagramInputFile.cxx

@@ -16,10 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "datagramInputFile.h"
+#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"
+
 //#define SKYLER_TIMER 1
 #ifdef SKYLER_TIMER //[
   EXPCL_PANDAEXPRESS ProfileTimer Skyler_timer_file;

+ 8 - 3
panda/src/express/datagramIterator.cxx

@@ -16,11 +16,16 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "datagramIterator.h"
-#include "littleEndian.h"
-#include "bigEndian.h"
+#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 <notify.h>
+#endif
 
 ////////////////////////////////////////////////////////////////////
 //     Function: DatagramIterator::get_string

+ 6 - 0
panda/src/express/datagramOutputFile.cxx

@@ -16,6 +16,12 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
+
 #include "datagramOutputFile.h"
 
 ////////////////////////////////////////////////////////////////////

+ 5 - 1
panda/src/express/datagramSink.cxx

@@ -16,7 +16,11 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include <pandabase.h>
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
 
 #include "datagramSink.h"
 

+ 9 - 0
panda/src/express/error_utils.cxx

@@ -16,11 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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 <errno.h>
 #include <stdio.h>
+#endif
+
 #if defined(WIN32_VC)
   #include <winsock.h>
 #endif

+ 43 - 0
panda/src/express/express_headers.h

@@ -0,0 +1,43 @@
+// Filename: xxx_headers.h
+// Created by:  georges (30May01)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+#include <pandabase.h>
+#include <errno.h>
+#include <stdio.h>
+#include <notify.h>
+
+#include "clockObject.h"
+#include "config_express.h"
+#include "datagram.h"
+#include "datagramIterator.h"
+#include "error_utils.h"
+#include "hashVal.h"
+#include "indent.h"
+#include "memoryUsagePointers.h"
+#include "numeric_types.h"
+#include "profileTimer.h"
+#include "referenceCount.h"
+#include "trueClock.h"
+#include "typedef.h"
+#include "typedObject.h"
+#include "typedReferenceCount.h"
+
+#include <algorithm>
+
+#pragma hdrstop
+

+ 10 - 1
panda/src/express/get_config_path.cxx

@@ -16,10 +16,19 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "get_config_path.h"
+#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 <executionEnvironment.h>
+#include "get_config_path.h"
 
 
 ////////////////////////////////////////////////////////////////////

+ 1 - 0
panda/src/express/hashGeneratorBase.cxx

@@ -17,3 +17,4 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "hashGeneratorBase.h"
+

+ 8 - 0
panda/src/express/hashVal.cxx

@@ -16,5 +16,13 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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
 

+ 8 - 0
panda/src/express/indent.cxx

@@ -16,7 +16,15 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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

+ 12 - 2
panda/src/express/memoryUsage.cxx

@@ -16,17 +16,27 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "memoryUsage.h"
+#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"
 
 #ifndef NDEBUG
 // Nothing in this module gets compiled in NDEBUG mode.
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "config_express.h"
-
 #include <algorithm>
+#endif
 
 MemoryUsage *MemoryUsage::_global_ptr = (MemoryUsage *)NULL;
 

+ 16 - 0
panda/src/express/memoryUsagePointers.cxx

@@ -16,15 +16,31 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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

+ 10 - 1
panda/src/express/multifile.cxx

@@ -15,13 +15,22 @@
 // [email protected] .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include <pandabase.h>
-#include "multifile.h"
 #include "config_express.h"
 #include "error_utils.h"
 
 #include <algorithm>
 #include <errno.h>
+#endif
+
+#include "multifile.h"
 
 ////////////////////////////////////////////////////////////////////
 // Defines

+ 6 - 0
panda/src/express/namable.cxx

@@ -16,6 +16,12 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
+
 #include "namable.h"
 
 TypeHandle Namable::_type_handle;

+ 1 - 0
panda/src/express/nativeNumericData.cxx

@@ -17,3 +17,4 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "nativeNumericData.h"
+

+ 11 - 3
panda/src/express/patchfile.cxx

@@ -15,12 +15,20 @@
 // [email protected] .
 //
 ////////////////////////////////////////////////////////////////////
-#include "patchfile.h"
+#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 "crypto_utils.h" // MD5 stuff
-
 #include <stdio.h> // for tempnam
+#endif
+
+#include "patchfile.h"
+#include "crypto_utils.h" // MD5 stuff
 
 // this actually slows things down...
 //#define USE_MD5_FOR_HASHTABLE_INDEX_VALUES

+ 10 - 0
panda/src/express/profileTimer.cxx

@@ -15,8 +15,18 @@
 // [email protected] .
 //
 ////////////////////////////////////////////////////////////////////
+#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 <map>
+
 using namespace std;
 
 // See ProfileTimer.h for documentation.

+ 8 - 0
panda/src/express/referenceCount.cxx

@@ -16,6 +16,14 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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;

+ 9 - 1
panda/src/express/reversedNumericData.cxx

@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "reversedNumericData.h"
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include <notify.h>
+#endif
+
+#include "reversedNumericData.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: ReversedNumericData::reverse_assign

+ 16 - 1
panda/src/express/trueClock.cxx

@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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;
 
@@ -34,7 +42,6 @@ TrueClock *TrueClock::_global_ptr = NULL;
 
 #define WINDOWS_LEAN_AND_MEAN
 #include <windows.h>
-#include <winbase.h>
 #undef WINDOWS_LEAN_AND_MEAN
 
 static BOOL _has_high_res;
@@ -104,8 +111,16 @@ TrueClock() {
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "express_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include <eeregs.h>
 #include <eekernel.h>
+#endif
 
 static unsigned int _msec;
 static unsigned int _sec;

+ 8 - 0
panda/src/express/typeHandle.cxx

@@ -16,12 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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 <algorithm>
+#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

+ 8 - 0
panda/src/express/typedReferenceCount.cxx

@@ -16,6 +16,14 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#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;

+ 0 - 4
panda/src/lerp/lerp_headers.h

@@ -16,12 +16,8 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "config_lerp.h"
 #include "lerp.h"
-#include "lerpblend.h"
 #include "lerpfunctor.h"
-#include <clockObject.h>
-#include <throw_event.h>
 
 #pragma hdrstop