kmx git

Commit 8a02d0b03be5062b3b40cbcebf9775cf86b91f1f

2008-04-25T09:59:25

* Somewhat hackish support for Solaris 10 x86 support. The problem is that our public headers need the GL and GLU headers, which are in very different locations depending the system. One solution would be to generate FTGL.h at configure time. Patch by Kent Mein, taken from Blender commit r12796.

diff --git a/include/FTGL.h b/include/FTGL.h
index 57f137e..fb937c7 100644
--- a/include/FTGL.h
+++ b/include/FTGL.h
@@ -79,7 +79,7 @@ typedef float    FTGL_FLOAT;
 
 #else
 
-    // Non windows platforms - don't require nonsense as seen above :-)    
+    // Non windows platforms - don't require nonsense as seen above :-)
     #ifndef __gl_h_
         #ifdef SDL_main
             #include "SDL_opengl.h"
@@ -88,12 +88,16 @@ typedef float    FTGL_FLOAT;
             #include <OpenGL/glu.h>
         #else
             #include <GL/gl.h>
-            #include <GL/glu.h>
-        #endif                
+            #if defined (__sun__) && !defined (__sparc__)
+                #include <mesa/glu.h>
+            #else
+                #include <GL/glu.h>
+            #endif
+        #endif
 
     #endif
 
-    // Required for compatibility with glext.h style function definitions of 
+    // Required for compatibility with glext.h style function definitions of
     // OpenGL extensions, such as in src/osg/Point.cpp.
     #ifndef APIENTRY
         #define APIENTRY

kc3-lang/ftgl

Commit 8a02d0b03be5062b3b40cbcebf9775cf86b91f1f