Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5749 for code/trunk/src


Ignore:
Timestamp:
Sep 20, 2009, 12:10:34 AM (15 years ago)
Author:
rgrieder
Message:

Sorted out header file finding issues and updated/added precompiled header files.
PCH is not activated per default for the pong projects (only 7 files).

Location:
code/trunk/src
Files:
8 added
18 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/external/bullet/CMakeLists.txt

    r5738 r5749  
    3434  ORXONOX_EXTERNAL
    3535  NO_DLL_INTERFACE
     36  PCH_FILE
     37    BulletPrecompiledHeaders.h
    3638  VERSION
    3739    2.74

  • code/trunk/src/libraries/core/CorePrecompiledHeaders.h

    r5738 r5749  
    3030@file
    3131@brief
    32     Compilation of the most often used header files in the core library for MSVC
     32    Compilation of the most often used header files in the core library
     33@details
     34    Updated: 13. September 2009
     35    Total Files: 56
    3336*/
    3437
    3538#include "OrxonoxConfig.h"
    3639
    37 #include <cassert>
    38 #include <fstream>
    39 #include <iostream>
    40 #include <list>
    41 #include <locale>
    42 #include <map>
    43 #include <queue>
    44 #include <set>
    45 #include <sstream>
    46 #include <stack>
    47 #include <string>
    48 #include <vector>
     40///////////////////////////////////////////
     41/////          Stable Headers         /////
     42///////////////////////////////////////////
    4943
     44#include <string>   // 54
     45#include <vector>   // 54
     46#include <cassert>  // 53
     47#include <fstream>  // 53
     48#include <iostream> // 53
     49#include <map>      // 53
     50#include <sstream>  // 53
     51#include <set>      // 50
     52
     53#include "util/Debug.h" // 48
     54
     55#include <deque>    // 43
     56#include <list>     // 44
     57#include <cmath>    // 42
     58
     59#include "util/ScopeGuard.h" // 38
     60
     61#include <OgreMath.h>        // 36
     62#include <OgreVector2.h>     // 36
     63#include <OgreVector3.h>     // 36
     64#include <OgreVector4.h>     // 36
     65#include <OgreQuaternion.h>  // 36
     66#include <OgreColourValue.h> // 36
     67#include <boost/preprocessor/cat.hpp> // 27
     68#include <boost/shared_ptr.hpp> // 21
    5069
    5170#ifdef ORXONOX_COMPILER_MSVC
    5271
    53 #include <OgreMath.h>
    54 #include <OgreVector2.h>
    55 #include <OgreVector3.h>
    56 #include <OgreVector4.h>
    57 #include <OgreQuaternion.h>
    58 #include <OgreColourValue.h>
     72#include <ois/OISKeyboard.h> // 15
     73#include <ois/OISMouse.h>    // 15
     74#include <ois/OISJoyStick.h> // 15
    5975
    60 #include <boost/shared_ptr.hpp> // 12
    61 #include <boost/preprocessor/cat.hpp> // 12
     76#include "util/SubString.h"  // 14
     77
     78#include <boost/scoped_ptr.hpp> // 13
     79#include <stack> // 12
     80
     81#endif /*ORXONOX_COMPILER_MSVC */
     82
    6283
    6384// Just in case some header included windows.h
    6485#undef min
    6586#undef max
    66 
    67 #endif /* ORXONOX_COMPILER_MSVC */
    68 
    69 
    70 #include "util/Debug.h"
    71 #include "util/Math.h"
    72 #include "util/MultiType.h"
    73 #include "util/SubString.h"
    74 
    75 
    76 #ifdef ORXONOX_COMPILER_MSVC
    77 
    78 // A change would trigger an 80% Core rebuild anyway
    79 #include "Identifier.h"
    80 
    81 #endif /*ORXONOX_COMPILER_MSVC */

  • code/trunk/src/libraries/network/ClientConnection.cc

    r5738 r5749  
    3030
    3131#include <cassert>
     32#define WIN32_LEAN_AND_MEAN
    3233#include <enet/enet.h>
    3334#include "util/Debug.h"

  • code/trunk/src/libraries/network/ClientInformation.cc

    r5738 r5749  
    4040
    4141#include "ClientInformation.h"
     42#define WIN32_LEAN_AND_MEAN
    4243#include <enet/enet.h>
    4344

  • code/trunk/src/libraries/network/Connection.cc

    r5738 r5749  
    3030
    3131#include <cassert>
     32#define WIN32_LEAN_AND_MEAN
    3233#include <enet/enet.h>
    3334#include "packet/Packet.h"

  • code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h

    r5738 r5749  
    3131@brief
    3232    Compilation of the most often used header files in the network library
     33@details
     34    Updated: 13. September 2009
     35    Total Files: 28
    3336*/
    3437
    3538#include "OrxonoxConfig.h"
    3639
    37 #include <cassert>
    38 #include <fstream>
    39 #include <iostream>
    40 #include <list>
    41 #include <map>
    42 #include <queue>
    43 #include <set>
    44 #include <sstream>
    45 #include <string>
    46 #include <vector>
     40///////////////////////////////////////////
     41/////          Stable Headers         /////
     42///////////////////////////////////////////
    4743
     44#include <cstring>  // 26
     45#include <cassert>  // 24
     46#include <string>   // 23
     47#include <vector>   // 23
     48#include <map>      // 23
     49#include <fstream>  // 22
     50#include <iostream> // 22
     51#include <sstream>  // 22
     52#include <set>      // 20
     53
     54#include "util/Debug.h"      // 20
     55#include "util/TypeTraits.h" // 18
    4856
    4957#ifdef ORXONOX_COMPILER_MSVC
    5058
    51 #include <OgreMath.h>
    52 #include <OgreVector2.h>
    53 #include <OgreVector3.h>
    54 #include <OgreVector4.h>
    55 #include <OgreQuaternion.h>
    56 #include <OgreColourValue.h>
     59#include <deque>    // 17
     60#include <queue>    // 17
     61#include <list>     // 16
     62#include <cmath>    // 15
     63
     64#include <OgreMath.h>        // 15
     65#include <OgreVector2.h>     // 15
     66#include <OgreVector3.h>     // 15
     67#include <OgreVector4.h>     // 15
     68#include <OgreQuaternion.h>  // 15
     69#include <OgreColourValue.h> // 15
     70
     71#include "util/mbool.h" // 11
    5772
    5873#define WIN32_LEAN_AND_MEAN
    59 #include <enet/enet.h>
     74#include <enet/enet.h> // 6, 3.1MB
     75
     76#endif /*ORXONOX_COMPILER_MSVC */
     77
     78
     79// Just in case some header included windows.h
     80#undef min
    6081#undef max
    61 #undef min
    62 
    63 #include "util/Debug.h"
    64 #include "core/Identifier.h"
    65 
    66 #endif /* ORXONOX_COMPILER_MSVC */

  • code/trunk/src/libraries/network/Server.cc

    r5738 r5749  
    4141#include "Server.h"
    4242
     43#define WIN32_LEAN_AND_MEAN
    4344#include <enet/enet.h>
    4445#include <cassert>

  • code/trunk/src/libraries/network/ServerConnection.cc

    r5738 r5749  
    3131#include <cassert>
    3232#include <string>
     33#define WIN32_LEAN_AND_MEAN
    3334#include <enet/enet.h>
    3435

  • code/trunk/src/libraries/network/packet/Packet.cc

    r5738 r5749  
    3232#include <cassert>
    3333#include <cstring>
     34#define WIN32_LEAN_AND_MEAN
    3435#include <enet/enet.h>
    3536#include <boost/static_assert.hpp>

  • code/trunk/src/libraries/tools/CMakeLists.txt

    r5738 r5749  
    1414
    1515ORXONOX_ADD_LIBRARY(tools
     16  FIND_HEADER_FILES
     17  PCH_FILE
     18    ToolsPrecompiledHeaders.h
    1619  DEFINE_SYMBOL
    1720    "TOOLS_SHARED_BUILD"

  • code/trunk/src/libraries/util/CMakeLists.txt

    r5747 r5749  
    3434)
    3535
    36 SET_SOURCE_FILES(UTIL_HDR_FILES
    37   CRC32.h
    38   Clipboard.h
    39   Convert.h
    40   Debug.h
    41   Exception.h
    42   ExprParser.h
    43   Math.h
    44   MathConvert.h
    45   mbool.h
    46   MultiType.h
    47   MultiTypeValue.h
    48   OgreForwardRefs.h
    49   OrxAssert.h
    50   OrxEnum.h
    51   OutputBuffer.h
    52   OutputHandler.h
    53   RefToValue.h
    54   ScopeGuard.h
    55   Serialise.h
    56   SignalHandler.h
    57   Singleton.h
    58   Sleep.h
    59   StringUtils.h
    60   SubString.h
    61   TemplateUtils.h
    62   TypeTraits.h
    63   UTFStringConversions.h
    64   UtilPrereqs.h
    65 )
    66 
    6736IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
    6837  # Get around displaying a few hundred lines of warning code
    … …  
    7140
    7241ORXONOX_ADD_LIBRARY(util
     42  FIND_HEADER_FILES
    7343  DEFINE_SYMBOL
    7444    "UTIL_SHARED_BUILD"
    … …  
    7747    ${OGRE_LIBRARY}
    7848  SOURCE_FILES
    79     ${UTIL_SRC_FILES} ${UTIL_HDR_FILES}
     49    ${UTIL_SRC_FILES}
    8050)

  • code/trunk/src/modules/gamestates/CMakeLists.txt

    r5738 r5749  
    1313ORXONOX_ADD_LIBRARY(gamestates
    1414  MODULE
     15  FIND_HEADER_FILES
     16  PCH_FILE
     17    GameStatesPrecompiledHeaders.h
    1518  DEFINE_SYMBOL
    1619    "GAMESTATES_SHARED_BUILD"

  • code/trunk/src/modules/objects/CMakeLists.txt

    r5738 r5749  
    1212ORXONOX_ADD_LIBRARY(objects
    1313  MODULE
     14  FIND_HEADER_FILES
     15  PCH_FILE
     16    ObjectsPrecompiledHeaders.h
    1417  DEFINE_SYMBOL
    1518    "OBJECTS_SHARED_BUILD"

  • code/trunk/src/modules/overlays/CMakeLists.txt

    r5738 r5749  
    1212  MODULE
    1313  FIND_HEADER_FILES
     14  PCH_FILE
     15    OverlaysPrecompiledHeaders.h
    1416  DEFINE_SYMBOL
    1517    "OVERLAYS_SHARED_BUILD"

  • code/trunk/src/modules/pong/CMakeLists.txt

    r5738 r5749  
    1111ORXONOX_ADD_LIBRARY(pong
    1212  MODULE
     13  FIND_HEADER_FILES
     14  PCH_FILE
     15    PongPrecompiledHeaders.h
     16  PCH_NO_DEFAULT
    1317  DEFINE_SYMBOL
    1418    "PONG_SHARED_BUILD"

  • code/trunk/src/modules/questsystem/CMakeLists.txt

    r5745 r5749  
    2525ORXONOX_ADD_LIBRARY(questsystem
    2626  MODULE
     27  FIND_HEADER_FILES
    2728  TOLUA_FILES
    2829    QuestDescription.h
    … …  
    3031  DEFINE_SYMBOL
    3132    "QUESTSYSTEM_SHARED_BUILD"
     33  PCH_FILE
     34    QuestsystemPrecompiledHeaders.h
    3235  LINK_LIBRARIES
    3336    orxonox

  • code/trunk/src/modules/weapons/CMakeLists.txt

    r5738 r5749  
    99ORXONOX_ADD_LIBRARY(weapons
    1010  MODULE
     11  FIND_HEADER_FILES
     12  PCH_FILE
     13    WeaponsPrecompiledHeaders.h
    1114  DEFINE_SYMBOL
    1215    "WEAPONS_SHARED_BUILD"

  • code/trunk/src/orxonox/OrxonoxPrecompiledHeaders.h

    r3370 r5749  
    3030@file
    3131@brief
    32     Compilation of the most often used header files in the orxonox executable
     32    Compilation of the most often used header files in the orxonox library
     33@details
     34    Updated: 13. September 2009
     35    Total Files: 88
    3336*/
    3437
    3538#include "OrxonoxConfig.h"
    3639
    37 #include <cassert>
    38 #include <deque>
    39 #include <fstream>
    40 #include <iostream>
    41 #include <list>
    42 #include <map>
    43 #include <set>
    44 #include <sstream>
    45 #include <stack>
    46 #include <string>
    47 #include <vector>
     40///////////////////////////////////////////
     41/////          Stable Headers         /////
     42///////////////////////////////////////////
    4843
    49 // Prevent headers from including winsock.h that messes with winsock2.h from ENet
    50 #define WIN32_LEAN_AND_MEAN
     44#include <cassert>  // 87
     45#include <cstring>  // 87
     46#include <fstream>  // 87
     47#include <iostream> // 87
     48#include <map>      // 87
     49#include <set>      // 87
     50#include <sstream>  // 87
     51#include <string>   // 87
     52#include <vector>   // 87
     53#include <list>     // 86
     54#include <ctime>    // 82
     55#include <cmath>    // 81
     56#include <deque>    // 81
     57#include <queue>    // 81
    5158
     59#include <OgreMath.h>        // 81
     60#include <OgreVector2.h>     // 81
     61#include <OgreVector3.h>     // 81
     62#include <OgreVector4.h>     // 81
     63#include <OgreQuaternion.h>  // 81
     64#include <OgreColourValue.h> // 81
    5265
    53 #ifdef ORXONOX_COMPILER_MSVC
     66#include "util/OgreForwardRefs.h"     // 67
     67#include <LinearMath/btMotionState.h> // 60
     68#include "util/SubString.h" // 55
     69#include <tinyxml/ticpp.h>  // 41
    5470
    55 // Note: Numbers after the include specify the number of times included (2009-06-19)
    56 // The sizes in MB was just to see how much the MSVC9 PCH file increases for Ogre includes
    57 #include <OgreMaterial.h> // 33, 2.7MB
    58 #include <OgreRenderable.h> // 32, 2.6MB
    59 #include <OgreSingleton.h> // 28, 0.0MB
    60 #include <OgreSceneNode.h> // 25, 1.1MB
    61 #include <OgreTexture.h> // 25, 0.2MB (1.1MB)
    62 #include <OgreMovableObject.h> // 22, 1.3MB
    63 #include <OgreResourceGroupManager.h> // 21, 1.4MB
    64 #include <OgreTechnique.h> // 18, 1.2MB
    65 //#include <OgreSceneManager.h> // 16, 7.4MB
     71//#include <OgreRenderable.h> // 14, 5.1MB
     72//#include <OgreSceneNode.h>  // 13, 1MB
     73//#include <OgreResourceGroupManager.h> // 12, 1.5MB
     74//#include <OgreTexture.h>       // 11, 0.6MB
     75//#include <OgreMovableObject.h> // 10, 1.6MB
     76//#include <OgreSceneManager.h>  // 9, 8.7MB
    6677
    67 #endif
     78///////////////////////////////////////////
     79/////       All Rebuild Headers       /////
     80///////////////////////////////////////////
    6881
     82#include "core/BaseObject.h"   // 82
     83#include "core/CoreIncludes.h" // 80
    6984
    70 //#include <boost/preprocessor/cat.hpp> // 15
    71 //#include <boost/shared_ptr.hpp> // 13
    72 #include <LinearMath/btMotionState.h>
    73 #include <tinyxml/ticpp.h>
     85///////////////////////////////////////////
     86/////      Not so Stable Headers      /////
     87///////////////////////////////////////////
     88
     89#include "network/synchronisable/Synchronisable.h" // 70
     90#include "util/MultiType.h"    // 65
     91#include "core/Executor.h"     // 55
     92//#include "core/XMLPort.h"     // 41
     93
    7494
    7595// Just in case some header included windows.h
    7696#undef min
    7797#undef max
    78 
    79 //--------- Orxonox files --------
    80 //--------------------------------
    81 
    82 //#include "util/Convert.h" // 24
    83 #include "util/Debug.h"
    84 #include "util/Exception.h"
    85 #include "util/Math.h"
    86 #include "util/OgreForwardRefs.h"
    87 #include "util/SubString.h"
    88 
    89 #include "core/BaseObject.h"
    90 //#include "core/ConfigValueIncludes.h" // 19
    91 //#include "core/ConsoleCommand.h" // 15
    92 //#include "core/Core.h" // ?, but not many times
    93 #include "core/CoreIncludes.h"
    94 #include "core/XMLPort.h"
    95 
    96 #include "network/synchronisable/Synchronisable.h"
    97 //#include "network/ClientInformation.h" // 26
    98 //#include "network/ClientConnectionListener.h" // 24
Note: See TracChangeset for help on using the changeset viewer.