From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 18 Jan 2005 22:58:13 +0000 (+0000)
Subject: minor reorg of shader files, disable building for now
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c47d19a1a2f42df3131d5e9e41cb2d4be2fbd417;p=mesa.git

minor reorg of shader files, disable building for now
---

diff --git a/src/mesa/sources b/src/mesa/sources
index 8dd6d31a5c0..3cf945009e7 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -149,16 +149,21 @@ SHADER_SOURCES = \
 	shader/nvvertparse.c \
 	shader/program.c \
 	shader/shaderobjects.c \
-	shader/shaderobjects_3dlabs.c \
+	shader/shaderobjects_3dlabs.c
+
+SLANG_SOURCES = \
 	shader/slang/MachineIndependent/preprocessor/atom.c \
 	shader/slang/MachineIndependent/preprocessor/cpp.c \
 	shader/slang/MachineIndependent/preprocessor/cppstruct.c \
 	shader/slang/MachineIndependent/preprocessor/memory.c \
 	shader/slang/MachineIndependent/preprocessor/scanner.c \
 	shader/slang/MachineIndependent/preprocessor/symbols.c \
-	shader/slang/MachineIndependent/preprocessor/tokens.c \
+	shader/slang/MachineIndependent/preprocessor/tokens.c
+
+SLANG_CPP_SOURCES = \
 	shader/slang/slang_mesa.cpp 
 
+
 ASM_C_SOURCES =	\
 	x86/common_x86.c \
 	x86/x86.c \
@@ -183,7 +188,7 @@ X86_SOURCES =			\
 	x86/sse_xform2.S	\
 	x86/sse_xform3.S	\
 	x86/sse_xform4.S	\
-	x86/sse_normal.S \
+	x86/sse_normal.S	\
 	x86/read_rgba_span_x86.S \
 	tnl/t_vtx_x86_gcc.S
 
@@ -250,12 +255,13 @@ CORE_SOURCES = \
 	$(SWRAST_SOURCES)	\
 	$(SWRAST_SETUP_SOURCES)	\
 	$(ASM_C_SOURCES)
-
+#	$(SLANG_SOURCES)	\
 
 
 ### Object files
 
-CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SHADER_SOURCES:.cpp=.o)
+CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
+# $(SLANG_CPP_SOURCES:.cpp=.o)
 
 OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)