Disable C++ shading language code yet again. Doesn't compile with older

g++ installations.

diff --git a/src/mesa/shader/shaderobjects.c b/src/mesa/shader/shaderobjects.c
index ac8ff1af487ddcdc5d47cd65f4ac9e649184c348..490794170d4ba0995da52e2a3de5152eabc25858 100644 (file)
--- a/src/mesa/shader/shaderobjects.c
+++ b/src/mesa/shader/shaderobjects.c
@@ -1177,6 +1177,8 @@ _mesa_init_shaderobjects (GLcontext *ctx)
 {
        ctx->ShaderObjects.current_program = NULL;
 
+#if 0  /* disable for now */
        _mesa_init_shaderobjects_3dlabs (ctx);
+#endif
 }
 

diff --git a/src/mesa/sources b/src/mesa/sources
index 57059a5ae3abf4c87d403ced00928e20bf890c88..b2f19cc00bb3201f8705b64ced449c4ce5148543 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -149,8 +149,9 @@ SHADER_SOURCES = \
        shader/nvvertexec.c \
        shader/nvvertparse.c \
        shader/program.c \
-       shader/shaderobjects.c \
-       shader/shaderobjects_3dlabs.c
+       shader/shaderobjects.c
+
+#      shader/shaderobjects_3dlabs.c
 
 SLANG_SOURCES = \
        shader/slang/MachineIndependent/preprocessor/atom.c \
@@ -276,7 +277,8 @@ CORE_SOURCES = \
 
 ### Object files
 
-CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
+#CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
+CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
 
 OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)