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

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/importer

Files:

• object.cc (modified) (1 diff)
• windowHandler.h (modified) (1 diff)

orxonox/trunk/importer/object.cc

@@ -341 +341 @@
         {
           readGroup (Buffer+2);
+        }
+      else if (!strncmp(Buffer, "s", 1))
+        {
+          if (verbose >= 1)
+            printf("smoothing groups not suportet yet. line: %s\n", Buffer);
         }
     }

orxonox/trunk/importer/windowHandler.h

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