Changeset 7125

Timestamp:

Jun 9, 2010, 5:34:23 PM (14 years ago)

Author:

adrfried

Message:

fix includes for compiling without PCH

Location:

code/branches/presentation3/src

Files:

• libraries/util/Singleton.h (modified) (1 diff)
• orxonox/overlays/GUISheet.cc (modified) (1 diff)

code/branches/presentation3/src/libraries/util/Singleton.h

@@ -32 +32 @@
 #include "UtilPrereqs.h"
 #include <cassert>
+
+#ifndef NULL
+#  define NULL 0
+#endif
 
 namespace orxonox

code/branches/presentation3/src/orxonox/overlays/GUISheet.cc

@@ -32 +32 @@
 #include "core/GUIManager.h"
 #include "core/XMLPort.h"
+#include "core/GameMode.h"
 
 namespace orxonox