Changeset 3238 in orxonox.OLD for orxonox/branches/sound/src/stdincl.h

Timestamp:

Dec 20, 2004, 2:42:54 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/sound/src/stdincl.h (modified) (1 diff)

orxonox/branches/sound/src/stdincl.h

@@ +1 @@
+/*!
+  \file stdincl.h
+  \brief This file includes default headers that nearly every Class needs.
+  
+  no Class is defined here, but many headers to classes, and more general Headers like the openGL-header.
+*/
 
-#ifndef STDINCL_H
-#define STDINCL_H
+#ifndef _STDINCL_H
+#define _STDINCL_H
 
-#define null 0
+#define null 0   //!< null
+
+// this includes the information from configure/makefiles
+#if HAVE_CONFIG_H 
+#include <config.h> 
+#endif
 
 #ifdef __WIN32__
 #include <windows.h>
 #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 "vector.h"
 #include "coordinates.h"
 #include "list.h"
+#include "list_template.h"
 #include "error.h"
+#include "debug.h"
 #include "message_structures.h"
 #include "orxonox.h"
 
-#endif
+#endif /* _STDINCL_H */