diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-17 17:00:46 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-17 17:00:46 +0100 |
| commit | e195eab9093d2a6cf55a42b2e7789c9a381b7782 (patch) | |
| tree | 508408dbb9537f508e6831df033506da8f66b8da /src/mesa/sources.mak | |
| parent | 1c28073fdfb56a241424c739b57845f47fa05002 (diff) | |
| parent | 75f371e973d19650a5c157a0844e43ffdea5e43e (diff) | |
Merge branch 'glsl-pp-rework-2'
Diffstat (limited to 'src/mesa/sources.mak')
| -rw-r--r-- | src/mesa/sources.mak | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index a0d7dbbace..a7a3b9a7f9 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -218,7 +218,6 @@ SHADER_SOURCES = \ shader/arbprogparse.c \ shader/arbprogram.c \ shader/atifragshader.c \ - shader/grammar/grammar_mesa.c \ shader/hash_table.c \ shader/lex.yy.c \ shader/nvfragparse.c \ @@ -255,7 +254,6 @@ SLANG_SOURCES = \ shader/slang/slang_link.c \ shader/slang/slang_log.c \ shader/slang/slang_mem.c \ - shader/slang/slang_preprocess.c \ shader/slang/slang_print.c \ shader/slang/slang_simplify.c \ shader/slang/slang_storage.c \ @@ -365,6 +363,12 @@ GLAPI_OBJECTS = \ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o) +### Other archives/libraries + +GLSL_LIBS = \ + $(TOP)/src/glsl/pp/libglslpp.a \ + $(TOP)/src/glsl/cl/libglslcl.a + ### Include directories |