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

Timestamp:

Nov 26, 2004, 2:49:55 PM (19 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

File:

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

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>