Changeset 1841 for code/trunk/src/orxonox/objects/WorldEntity.h

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.

File:

• code/trunk/src/orxonox/objects/WorldEntity.h (modified) (1 diff)

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