Changeset 2995 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Nov 26, 2004, 2:49:55 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/osX back into the Trunk.
Conflicts resolved in Favor of trunk in all the Makefiles, and fixed many strange entries in configure.ac
merged with command: svn merge branches/osX/ trunk/ -r 2887:HEAD
AND most Important of all: change back to AUTOMAKE-1.7

Location:

orxonox/trunk/src

Files:

• keynames.cc (modified) (1 diff)
• keynames.h (modified) (1 diff)
• orxonox.h (modified) (1 diff)
• stdincl.h (modified) (1 diff)

orxonox/trunk/src/keynames.cc

@@ -13 +13 @@
    co-programmer: ...
 */
-#include <SDL/SDL.h>
 
 #include "keynames.h"

orxonox/trunk/src/keynames.h

@@ -10 +10 @@
 #endif
 
+#ifndef __APPLE__
 #include <SDL/SDL.h>
+#else
+#include <SDL.h>
+#endif
 
 /**

orxonox/trunk/src/orxonox.h

@@ -6 +6 @@
 #ifndef ORXONOX_H
 #define ORXONOX_H
-
-#include <SDL/SDL.h>
 
 #include "stdincl.h"

orxonox/trunk/src/stdincl.h

@@ -8 +8 @@
 #include <windows.h>
 #endif
+
+#ifndef __APPLE__
 #include <SDL/SDL.h>
+#else
+#include <SDL.h>
+#endif
+
 #include <GL/gl.h>
 #include <GL/glu.h>