Changeset 1841 for code/trunk/src

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/src

Files:

• core/BaseObject.h (modified) (1 diff)
• core/Namespace.h (modified) (1 diff)
• core/Super.h (modified) (1 diff)
• core/XMLIncludes.h (moved) (moved from code/trunk/src/util/XMLIncludes.h) (1 diff, 1 prop)
• core/XMLPort.h (modified) (1 diff)
• network/Synchronisable.h (modified) (1 diff)
• orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
• orxonox/gui/OgreCEGUIRenderer.h (modified) (1 diff)
• orxonox/objects/WorldEntity.h (modified) (1 diff)
• util/Sleep.h (modified) (1 diff)

code/trunk/src/core/BaseObject.h

@@ -41 +41 @@
 #include "Super.h"
 #include "OrxonoxClass.h"
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 
 namespace orxonox

code/trunk/src/core/Namespace.h

@@ -34 +34 @@
 #include <map>
 
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 #include "BaseObject.h"
 

code/trunk/src/core/Super.h

@@ -72 +72 @@
 
 #include "util/Debug.h"
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 
 ///////////////////////

code/trunk/src/core/XMLIncludes.h

@@ -32 +32 @@
 */
 
-#include "UtilPrereqs.h"
+#include "CorePrereqs.h"
 
 //-----------------------------------------------------------------------

code/trunk/src/core/XMLPort.h

@@ -33 +33 @@
 
 #include "util/Debug.h"
-#include "util/XMLIncludes.h"
 #include "util/MultiType.h"
 #include "tinyxml/ticpp.h"
+#include "XMLIncludes.h"
 #include "Executor.h"
 #include "CoreIncludes.h"

code/trunk/src/network/Synchronisable.h

@@ -34 +34 @@
 #include <list>
 #include "core/OrxonoxClass.h"
-#include "util/XMLIncludes.h"
+#include "core/XMLIncludes.h"
 #include "NetworkCallback.h"
 

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -79 +79 @@
 #include "util/String.h"
 #include "util/SubString.h"
-#include "util/XMLIncludes.h"
 
 #include "core/BaseObject.h"
@@ -87 +86 @@
 #include "core/CommandExecutor.h"
 #include "core/Executor.h"
+#include "core/XMLIncludes.h"
 #include "core/XMLPort.h"
 

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

@@ -38 +38 @@
 #include <OgreTextureUnitState.h>
 
-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
-#   ifdef OGRE_GUIRENDERER_EXPORTS
+/** CHANGES MADE BY ORXONOX TO FIT DLL IMPORT/EXPORT **/
+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
+#   ifdef ORXONOX_SHARED_BUILD
 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
 #   else

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

@@ -35 +35 @@
 #include <OgreSceneNode.h>
 #include "util/Math.h"
-#include "util/XMLIncludes.h"
 #include "network/Synchronisable.h"
+#include "core/XMLIncludes.h"
 #include "core/BaseObject.h"
 #include "Tickable.h"
-#include "../tools/Mesh.h"
+#include "tools/Mesh.h"
 
 namespace orxonox

code/trunk/src/util/Sleep.h

@@ -39 +39 @@
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
-
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+#include <winbase.h>
 
 inline void usleep(DWORD dwMicroseconds)