summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2005-03-29 02:31:43 +0000
committerBrian Paul <[email protected]>2005-03-29 02:31:43 +0000
commit93b52d9484c9b4221aeeb53799e395f3ad9cd62e (patch)
tree41feca8f305bf3df03be14c1bfff2e3bcf4376b1 /src/mesa
parent1706ba410187688b6d419171f39c140c5b549ad7 (diff)
re-enable shading language sources
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/sources7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/sources b/src/mesa/sources
index e62faea3d4a..57059a5ae3a 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -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)