diff options
| -rw-r--r-- | source/blender/include/BIF_gl.h | 4 | ||||
| -rw-r--r-- | source/nan_compile.mk | 2 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h index 611cefca51c..215e88dc002 100644 --- a/source/blender/include/BIF_gl.h +++ b/source/blender/include/BIF_gl.h @@ -57,12 +57,8 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> -#if defined(__sun__) && !defined(__sparc__) -#include <mesa/glu.h> -#else #include <GL/glu.h> #endif -#endif /* * these should be phased out. cpack should be replaced in * code with calls to glColor3ub, lrectwrite probably should diff --git a/source/nan_compile.mk b/source/nan_compile.mk index 620c57dcd84..d5bf04c4b33 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -191,7 +191,7 @@ ifeq ($(OS),solaris) JAVA_HEADERS = /usr/java/include JAVA_SYSTEM_HEADERS = /usr/java/include/solaris else - OPENGL_HEADERS = /usr/X11/include + OPENGL_HEADERS = $(LCGDIR)/mesa/include endif AR = ar ARFLAGS = ruv diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 73c0d83713d..5fda29b8002 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -482,7 +482,7 @@ endif export NAN_TIFF ?= /usr export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= - export NAN_MESA ?= /usr/src/Mesa-3.1 + export NAN_MESA ?= $(LCGDIR)/mesa export NAN_ZLIB ?= $(LCGDIR)/zlib export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_FREETYPE ?= $(LCGDIR)/freetype |