From 0a1b54df7ac118722bb627c61cb322cb4e248ace Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 21 Jun 2010 11:29:15 -0700
Subject: glsl2: Replace the GLSL compiler with the glsl2 project.

---
 src/mesa/sources.mak | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src/mesa/sources.mak')

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index ddd63cea0b..117b3f3d2b 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -250,6 +250,9 @@ SHADER_SOURCES = \
 	shader/shader_api.c \
 	shader/uniforms.c
 
+SHADER_CXX_SOURCES = \
+	shader/ir_to_mesa.cpp
+
 SLANG_SOURCES =	\
 	shader/slang/slang_builtin.c	\
 	shader/slang/slang_codegen.c	\
@@ -324,8 +327,10 @@ MESA_SOURCES = \
 	$(SWRAST_SOURCES)	\
 	$(SWRAST_SETUP_SOURCES)	\
 	$(COMMON_DRIVER_SOURCES)\
-	$(ASM_C_SOURCES)	\
-	$(SLANG_SOURCES)
+	$(ASM_C_SOURCES)
+
+MESA_CXX_SOURCES = \
+	 $(SHADER_CXX_SOURCES)
 
 # Sources for building Gallium drivers
 MESA_GALLIUM_SOURCES = \
@@ -335,12 +340,15 @@ MESA_GALLIUM_SOURCES = \
 	$(STATETRACKER_SOURCES)	\
 	$(SHADER_SOURCES)	\
 	ppc/common_ppc.c	\
-	x86/common_x86.c	\
-	$(SLANG_SOURCES)
+	x86/common_x86.c
+
+MESA_GALLIUM_CXX_SOURCES = \
+	 $(SHADER_CXX_SOURCES)
 
 # All the core C sources, for dependency checking
 ALL_SOURCES = \
 	$(MESA_SOURCES)		\
+	$(MESA_CXX_SOURCES)	\
 	$(MESA_ASM_SOURCES)	\
 	$(STATETRACKER_SOURCES)
 
@@ -349,10 +357,12 @@ ALL_SOURCES = \
 
 MESA_OBJECTS = \
 	$(MESA_SOURCES:.c=.o) \
+	$(MESA_CXX_SOURCES:.cpp=.o) \
 	$(MESA_ASM_SOURCES:.S=.o)
 
 MESA_GALLIUM_OBJECTS = \
 	$(MESA_GALLIUM_SOURCES:.c=.o) \
+	$(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \
 	$(MESA_ASM_SOURCES:.S=.o)
 
 
@@ -362,8 +372,7 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 ### Other archives/libraries
 
 GLSL_LIBS = \
-	$(TOP)/src/glsl/pp/libglslpp.a \
-	$(TOP)/src/glsl/cl/libglslcl.a
+	$(TOP)/src/glsl/libglsl.a
 
 
 ### Include directories
-- 
cgit v1.2.3