chenge the default location of mesa/gl header, added to lib path
authorCampbell Barton <ideasman42@gmail.com>
Fri, 14 Dec 2007 13:56:06 +0000 (13:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 14 Dec 2007 13:56:06 +0000 (13:56 +0000)
source/blender/include/BIF_gl.h
source/nan_compile.mk
source/nan_definitions.mk

index 611cefca51cadc2d008f8d9d9a6f40222da7a34c..215e88dc002528288bd2b93ca318800a36eb2468 100644 (file)
 #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
index 620c57dcd84c4095194054c1070f6e424666cd42..d5bf04c4b33a3d9a97ad51cc8399636349df93bd 100644 (file)
@@ -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
index 73c0d83713d33a47c38af5061bf45df601e4249b..5fda29b800243f4f85d3cb5e5bf94f2cbcdfe221 100644 (file)
@@ -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