Changeset 1841 for code/trunk/src/orxonox

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

Files:

• OrxonoxStableHeaders.h (modified) (2 diffs)
• gui/OgreCEGUIRenderer.h (modified) (1 diff)
• objects/WorldEntity.h (modified) (1 diff)

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