Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1841


Ignore:
Timestamp:
Sep 28, 2008, 1:15:26 AM (16 years ago)
Author:
rgrieder
Message:
  • "windows.h" —> "winbase.h" in Sleep.h. This causes less trouble with winsocks.h and winsocks2.h with enet.
  • adjusted import macros with OgreCEGUIRenderer to use our system partially.
  • moved XMLIncludes.h from util to core because we don't link util against tinyxml. So it would pretty awkward to have an tinyxml include there after all.
Location:
code/trunk
Files:
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • code/trunk/src/core/BaseObject.h

    r1747 r1841  
    4141#include "Super.h"
    4242#include "OrxonoxClass.h"
    43 #include "util/XMLIncludes.h"
     43#include "XMLIncludes.h"
    4444
    4545namespace orxonox

  • code/trunk/src/core/Namespace.h

    r1505 r1841  
    3434#include <map>
    3535
    36 #include "util/XMLIncludes.h"
     36#include "XMLIncludes.h"
    3737#include "BaseObject.h"
    3838

  • code/trunk/src/core/Super.h

    r1747 r1841  
    7272
    7373#include "util/Debug.h"
    74 #include "util/XMLIncludes.h"
     74#include "XMLIncludes.h"
    7575
    7676///////////////////////

  • code/trunk/src/core/XMLIncludes.h

    r1837 r1841  
    3232*/
    3333
    34 #include "UtilPrereqs.h"
     34#include "CorePrereqs.h"
    3535
    3636//-----------------------------------------------------------------------

  • code/trunk/src/core/XMLPort.h

    r1789 r1841  
    3333
    3434#include "util/Debug.h"
    35 #include "util/XMLIncludes.h"
    3635#include "util/MultiType.h"
    3736#include "tinyxml/ticpp.h"
     37#include "XMLIncludes.h"
    3838#include "Executor.h"
    3939#include "CoreIncludes.h"

  • code/trunk/src/network/Synchronisable.h

    r1751 r1841  
    3434#include <list>
    3535#include "core/OrxonoxClass.h"
    36 #include "util/XMLIncludes.h"
     36#include "core/XMLIncludes.h"
    3737#include "NetworkCallback.h"
    3838

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

    r1810 r1841  
    7979#include "util/String.h"
    8080#include "util/SubString.h"
    81 #include "util/XMLIncludes.h"
    8281
    8382#include "core/BaseObject.h"
    … …  
    8786#include "core/CommandExecutor.h"
    8887#include "core/Executor.h"
     88#include "core/XMLIncludes.h"
    8989#include "core/XMLPort.h"
    9090

  • code/trunk/src/orxonox/gui/OgreCEGUIRenderer.h

    r1784 r1841  
    3838#include <OgreTextureUnitState.h>
    3939
    40 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
    41 #   ifdef OGRE_GUIRENDERER_EXPORTS
     40/** CHANGES MADE BY ORXONOX TO FIT DLL IMPORT/EXPORT **/
     41#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
     42#   ifdef ORXONOX_SHARED_BUILD
    4243#       define OGRE_GUIRENDERER_API __declspec(dllexport)
    4344#   else

  • code/trunk/src/orxonox/objects/WorldEntity.h

    r1755 r1841  
    3535#include <OgreSceneNode.h>
    3636#include "util/Math.h"
    37 #include "util/XMLIncludes.h"
    3837#include "network/Synchronisable.h"
     38#include "core/XMLIncludes.h"
    3939#include "core/BaseObject.h"
    4040#include "Tickable.h"
    41 #include "../tools/Mesh.h"
     41#include "tools/Mesh.h"
    4242
    4343namespace orxonox

  • code/trunk/src/util/Sleep.h

    r1755 r1841  
    3939
    4040#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
    41 
    42 #ifndef WIN32_LEAN_AND_MEAN
    43 # define WIN32_LEAN_AND_MEAN
    44 #endif
    45 #include <windows.h>
     41#include <winbase.h>
    4642
    4743inline void usleep(DWORD dwMicroseconds)

  • code/trunk/visual_studio/vc8/core.vcproj

    r1839 r1841  
    416416                                >
    417417                        </File>
     418                        <File
     419                                RelativePath="..\..\src\core\XMLIncludes.h"
     420                                >
     421                        </File>
    418422                        <Filter
    419423                                Name="input"

  • code/trunk/visual_studio/vc8/util.vcproj

    r1839 r1841  
    262262                                >
    263263                        </File>
    264                         <File
    265                                 RelativePath="..\..\src\util\XMLIncludes.h"
    266                                 >
    267                         </File>
    268264                </Filter>
    269265        </Files>
Note: See TracChangeset for help on using the changeset viewer.