Changeset 3433 in orxonox.OLD for orxonox/trunk/src/stdincl.h

Timestamp:

Mar 1, 2005, 2:36:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged back the trackManager to the trunk.
merged with command:
svn merge -r 3369:HEAD branches/trackManager trunk
resolved conflicts in world.cc additive differences.

File:

• orxonox/trunk/src/stdincl.h (modified) (2 diffs)

orxonox/trunk/src/stdincl.h

@@ -22 +22 @@
 #endif
 
-#ifndef __APPLE__
-#include <SDL/SDL.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#else
-#include <SDL.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#endif
+#include "glincl.h"
 
+// MATH //
+#include "matrix.h"
 #include "vector.h"
-#include "matrix.h"
 #include "curve.h"
-//#include "coordinates.h"
+
 #include "list.h"
 #include "list_template.h"
-#include "error.h"
-#include "debug.h"
 #include "message_structures.h"
 #include "orxonox.h"
@@ -45 +36 @@
 #include "base_object.h"
 
+#include "error.h"
+#include "debug.h"
+
 #endif /* _STDINCL_H */