From 425569bbc530992560aa5a5955d4dd73eeaf85dd Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 29 Mar 2005 02:46:59 +0000
Subject: Disable C++ shading language code yet again.  Doesn't compile with
 older g++ installations.

---
 src/mesa/shader/shaderobjects.c | 2 ++
 src/mesa/sources                | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/shader/shaderobjects.c b/src/mesa/shader/shaderobjects.c
index ac8ff1af48..490794170d 100644
--- 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 57059a5ae3..b2f19cc00b 100644
--- 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)
 
-- 
cgit v1.2.3