Changeset 8296 in orxonox.OLD for branches/terrain/src

Timestamp:

Jun 9, 2006, 1:04:56 AM (19 years ago)

Author:

ponder

Message:

• volfog_effect.cc didn't compile on macosx, because there's no glX* stuff. Now macosx is handled specially
• For some reason, PACKAGE_NAME, PACKAGE_VERSION and similar variables were not found. I added them to debug.h, but thats just temporary.

Location:

branches/terrain/src

Files:

• defs/debug.h (modified) (1 diff)
• defs/glincl.h (modified) (1 diff)
• lib/graphics/effects/volfog_effect.cc (modified) (4 diffs)
• lib/util/threading.h (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)

branches/terrain/src/defs/debug.h

@@ -111 +111 @@
 #define PRINTFORX_VDEBUG  PRINTF5
 
+#ifndef ORX_DATADIR
+#define ORX_DATADIR "/usr/share"
+#endif
+#ifndef DEBUG_LEVEL
+#define DEBUG_LEVEL 2
+#endif
 #if DEBUG_LEVEL <= 3
 #define PRINTF(x)        PRINT(x)

branches/terrain/src/defs/glincl.h

@@ -17 +17 @@
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
 #endif
 

branches/terrain/src/lib/graphics/effects/volfog_effect.cc

@@ -23 +23 @@
 #include "glincl.h"
 //#include "shell_command.h"
-
 #define GLX_GLXEXT_PROTOTYPES
-#include <GL/glx.h>
-// #include <GL/glut.h>
-
-//#include <GL/glext.h> //OpenGL Extensions
-//#include <GL/glxext.h> // GLX Extensions 
-
+
+//#include <OpenGL/glext.h> //OpenGL Extensions
+//#include <OpenGL/glxext.h> // GLX Extensions 
+#ifndef __APPLE__
 #ifndef GL_EXT_fog_coord
 #define GL_EXT_fog_coord 1
@@ -45 +42 @@
 PFNGLFOGCOORDDVEXTPROC glFogCoorddvEXT = 0;
 PFNGLFOGCOORDPOINTEREXTPROC glFogCoordPointerEXT = 0;
-
+#endif
 
 using namespace std;
@@ -93 +90 @@
         float fogColor[4] = {0.6f,0.58f,0.79f,0.0f};
         
-
+#ifndef __APPLE__
         glFogCoordfEXT       = (PFNGLFOGCOORDFEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfEXT");
         glFogCoordfvEXT      = (PFNGLFOGCOORDFVEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfvEXT");
@@ -99 +96 @@
         glFogCoorddvEXT      = (PFNGLFOGCOORDDVEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoorddvEXT");
         glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordPointerEXT");
-
+#endif
         // set the fog attributes
         glFogf (GL_FOG_START,  fogStart);

branches/terrain/src/lib/util/threading.h

@@ -14 +14 @@
  #include <SDL/SDL_thread.h>
 #endif
-
+#include <string>
 namespace OrxThread
 {
@@ -31 +31 @@
     void start();
     void terminate();
-
-
   private:
     SDL_Thread* thread;

branches/terrain/src/orxonox.cc

@@ -27 +27 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ORXONOX
 #include "orxonox.h"
-
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "orxonox"
+#endif
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION "00"
+#endif
 #include "globals.h"