diff options
| author | Alan Hourihane <[email protected]> | 2008-11-01 22:57:26 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-11-01 22:57:26 +0000 |
| commit | 81c862205e32b163a9f5ecf3f59e4cdcccee36c6 (patch) | |
| tree | 50a5f45f1a0823758e72968d1f1dfd6e0d1098e0 /Makefile | |
| parent | 14e1505cce24ee294cb98683504cc4537c20f34a (diff) | |
| parent | bbffed0857634912c7a1f13882eba303ae2bf4e1 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -295,6 +295,8 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/drivers/x11/Makefile \ $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \ $(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/glslcompiler/Makefile \ + $(DIRECTORY)/src/mesa/drivers/glslcompiler/glslcompiler.c \ $(DIRECTORY)/src/mesa/ppc/*.[ch] \ $(DIRECTORY)/src/mesa/sparc/*.[chS] \ $(DIRECTORY)/src/mesa/x86/Makefile \ |