This commit reverts the #include <mesa/glu.h>
stuff used for peach to the standard <GL/glu.h> the mesa stuff was needed for the machines for peach but its not the stanard location of the headers, now that its not needed were switching it back. Kent
This commit is contained in:
@@ -56,20 +56,22 @@
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
#if defined (__sun) || defined (__sun__)
|
||||
/* #if defined (__sun) || defined (__sun__)
|
||||
#include <GL/gl.h>
|
||||
#include <mesa/glu.h>
|
||||
#else
|
||||
*/
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
/* #endif */
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* these should be phased out. cpack should be replaced in
|
||||
* code with calls to glColor3ub, lrectwrite probably should
|
||||
* change to a function. - zr
|
||||
*/
|
||||
|
||||
/*
|
||||
*
|
||||
* This define converts a numerical value to the equivalent 24-bit
|
||||
|
||||
@@ -9,11 +9,12 @@
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#if defined(__sun__) && !defined(__sparc__)
|
||||
/* #if defined(__sun__) && !defined(__sparc__)
|
||||
#include <mesa/glu.h>
|
||||
#else
|
||||
*/
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
/* #endif */
|
||||
#endif
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#if defined(__sun__) && !defined(__sparc__)
|
||||
/* #if defined(__sun__) && !defined(__sparc__)
|
||||
#include <mesa/glu.h>
|
||||
#else
|
||||
#else */
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
/* #endif */
|
||||
#endif
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -15,11 +15,12 @@
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#if defined(__sun__) && !defined(__sparc__)
|
||||
/* #if defined(__sun__) && !defined(__sparc__)
|
||||
#include <mesa/glu.h>
|
||||
#else
|
||||
*/
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
/* #endif */
|
||||
#endif
|
||||
|
||||
#include "KX_BlenderMaterial.h"
|
||||
|
||||
@@ -44,11 +44,11 @@
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#if defined(__sun__) && !defined(__sparc__)
|
||||
/* #if defined(__sun__) && !defined(__sparc__)
|
||||
#include <mesa/glu.h>
|
||||
#else
|
||||
#else */
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
/* #endif */
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
Reference in New Issue
Block a user