[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12882] trunk/blender/source: chenge the default location of mesa/gl header, added to lib path

[Campbell Barton]

Revision: 12882
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12882
Author:   campbellbarton
Date:     2007-12-14 14:56:06 +0100 (Fri, 14 Dec 2007)

Log Message:
-----------
chenge the default location of mesa/gl header, added to lib path

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_gl.h
    trunk/blender/source/nan_compile.mk
    trunk/blender/source/nan_definitions.mk
    trunk/blender/source/tools/guess/guessconfig

Modified: trunk/blender/source/blender/include/BIF_gl.h
===================================================================
--- trunk/blender/source/blender/include/BIF_gl.h	2007-12-14 12:27:10 UTC (rev 12881)
+++ trunk/blender/source/blender/include/BIF_gl.h	2007-12-14 13:56:06 UTC (rev 12882)
@@ -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

Modified: trunk/blender/source/nan_compile.mk
===================================================================
--- trunk/blender/source/nan_compile.mk	2007-12-14 12:27:10 UTC (rev 12881)
+++ trunk/blender/source/nan_compile.mk	2007-12-14 13:56:06 UTC (rev 12882)
@@ -191,7 +191,7 @@
     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

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2007-12-14 12:27:10 UTC (rev 12881)
+++ trunk/blender/source/nan_definitions.mk	2007-12-14 13:56:06 UTC (rev 12882)
@@ -482,7 +482,7 @@
     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

Modified: trunk/blender/source/tools/guess/guessconfig
===================================================================
--- trunk/blender/source/tools/guess/guessconfig	2007-12-14 12:27:10 UTC (rev 12881)
+++ trunk/blender/source/tools/guess/guessconfig	2007-12-14 13:56:06 UTC (rev 12882)
@@ -79,7 +79,7 @@
 if [ "$OS" = "solaris" ]; then
     # Adds the address space to the cpu if its 64bit
 	if [ `isainfo -b` = "64" ]; then
-		CPU=$CPU_64
+		CPU="$CPU"_64
 	fi
 fi