diff options
| author | Michal Krol <[email protected]> | 2009-12-17 17:00:46 +0100 |
|---|---|---|
| committer | Michal Krol <[email protected]> | 2009-12-17 17:00:46 +0100 |
| commit | e195eab9093d2a6cf55a42b2e7789c9a381b7782 (patch) | |
| tree | 508408dbb9537f508e6831df033506da8f66b8da /src/mesa/SConscript | |
| parent | 1c28073fdfb56a241424c739b57845f47fa05002 (diff) | |
| parent | 75f371e973d19650a5c157a0844e43ffdea5e43e (diff) | |
Merge branch 'glsl-pp-rework-2'
Diffstat (limited to 'src/mesa/SConscript')
| -rw-r--r-- | src/mesa/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index ca4a9afce5c..f4e0b98570d 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -189,7 +189,6 @@ if env['platform'] != 'winddk': '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', @@ -227,7 +226,6 @@ if env['platform'] != 'winddk': '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', @@ -338,7 +336,9 @@ if env['platform'] != 'winddk': # Add the dir containing the generated header (somewhere inside the # build dir) to the include path env.Append(CPPPATH = [matypes[0].dir]) - + + SConscript('shader/slang/library/SConscript') + # # Libraries # |