re-enable shading language sources
authorBrian Paul <brian.paul@tungstengraphics.com>
Tue, 29 Mar 2005 02:31:43 +0000 (02:31 +0000)
committerBrian Paul <brian.paul@tungstengraphics.com>
Tue, 29 Mar 2005 02:31:43 +0000 (02:31 +0000)
src/mesa/sources

index e62faea3d4ac5a3150c3f0657383faf74b3f5c4e..57059a5ae3abf4c87d403ced00928e20bf890c88 100644 (file)
@@ -149,9 +149,8 @@ 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 \
@@ -277,7 +276,7 @@ CORE_SOURCES = \
 
 ### Object files
 
-CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
+CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
 
 OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)