summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Krol <mjkrol@gmail.org>2005-03-14 12:43:59 +0000
committerMichal Krol <mjkrol@gmail.org>2005-03-14 12:43:59 +0000
commit02eb36fa8d51b9652fba546ea3e88e7be1d2ace8 (patch)
tree9f7aed02253f240a9c15630082e0dfb79174ab28
parent0c7d2fff1e67ff45e8846871a64c35c5433def44 (diff)
re-enable slang sources
-rw-r--r--src/mesa/sources11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/sources b/src/mesa/sources
index 79738c5638..e91144f799 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -162,8 +162,8 @@ SLANG_SOURCES = \
shader/slang/MachineIndependent/preprocessor/tokens.c
SLANG_CPP_SOURCES = \
- shader/slang/slang_mesa.cpp
-
+ shader/slang/slang_mesa.cpp \
+ shader/slang/MachineIndependent/Gen_glslang.cpp
ASM_C_SOURCES = \
x86/common_x86.c \
@@ -255,14 +255,13 @@ CORE_SOURCES = \
$(SHADER_SOURCES) \
$(SWRAST_SOURCES) \
$(SWRAST_SETUP_SOURCES) \
- $(ASM_C_SOURCES)
-# $(SLANG_SOURCES) \
+ $(ASM_C_SOURCES) \
+ $(SLANG_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)
OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)