diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-03-29 02:46:59 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-03-29 02:46:59 +0000 |
| commit | 425569bbc530992560aa5a5955d4dd73eeaf85dd (patch) | |
| tree | a83a6e3907b1c916152ebacb2cf0231f22765294 /src/mesa/sources | |
| parent | 93b52d9484c9b4221aeeb53799e395f3ad9cd62e (diff) | |
Disable C++ shading language code yet again. Doesn't compile with older
g++ installations.
Diffstat (limited to 'src/mesa/sources')
| -rw-r--r-- | src/mesa/sources | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/sources b/src/mesa/sources index 57059a5ae3..b2f19cc00b 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -149,8 +149,9 @@ 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 \ @@ -276,7 +277,8 @@ CORE_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) +CORE_OBJECTS = $(CORE_SOURCES:.c=.o) OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o) |