Changeset 1841 for code/trunk/src/core

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

Files:

• BaseObject.h (modified) (1 diff)
• Namespace.h (modified) (1 diff)
• Super.h (modified) (1 diff)
• XMLIncludes.h (moved) (moved from code/trunk/src/util/XMLIncludes.h) (1 diff, 1 prop)
• XMLPort.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"