summaryrefslogtreecommitdiff
path: root/src/mesa/sources
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-04-07 14:38:41 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-04-07 14:38:41 +0000
commitd9c389dff6836ea0e3b79f3682378f6998875399 (patch)
treebd36cb98ef91f851d3e62e65af4eee30285b989f /src/mesa/sources
parentc51ed8c2364b9e86a138cdb07fe2293ccc88f678 (diff)
Add shaderobjects_3dlabs.c back into build but use #ifdef FEATURE_shading_language to enable/disable relevant code.
Diffstat (limited to 'src/mesa/sources')
-rw-r--r--src/mesa/sources12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/sources b/src/mesa/sources
index b2f19cc00b..208970bdff 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -149,11 +149,10 @@ SHADER_SOURCES = \
shader/nvvertexec.c \
shader/nvvertparse.c \
shader/program.c \
- shader/shaderobjects.c
+ shader/shaderobjects.c \
+ shader/shaderobjects_3dlabs.c
-# shader/shaderobjects_3dlabs.c
-
-SLANG_SOURCES = \
+SLANG_C_SOURCES = \
shader/slang/MachineIndependent/preprocessor/atom.c \
shader/slang/MachineIndependent/preprocessor/cpp.c \
shader/slang/MachineIndependent/preprocessor/cppstruct.c \
@@ -271,8 +270,9 @@ CORE_SOURCES = \
$(SHADER_SOURCES) \
$(SWRAST_SOURCES) \
$(SWRAST_SETUP_SOURCES) \
- $(ASM_C_SOURCES) \
- $(SLANG_SOURCES)
+ $(ASM_C_SOURCES)
+
+# $(SLANG_C_SOURCES)
### Object files