diff options
| author | Brian Paul <[email protected]> | 2010-03-22 09:07:46 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-03-22 09:07:46 -0600 |
| commit | 182c42c8da6edfa66819eef02f4dea310c1f68d7 (patch) | |
| tree | f49df694eae81c9db3c8fe2123bb30ef5a556891 /src/mesa/drivers/glslcompiler/Makefile | |
| parent | 5cb4a3524b54480418b4c4717c4a0f0a8669939c (diff) | |
| parent | ca97f8b9bab80844be613a9253643b7da8e738c7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/mesa/drivers/glslcompiler/Makefile')
| -rw-r--r-- | src/mesa/drivers/glslcompiler/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/glslcompiler/Makefile b/src/mesa/drivers/glslcompiler/Makefile index 080fe475c16..d3404988d52 100644 --- a/src/mesa/drivers/glslcompiler/Makefile +++ b/src/mesa/drivers/glslcompiler/Makefile @@ -10,9 +10,10 @@ PROGRAM = glslcompiler OBJECTS = \ glslcompiler.o \ ../../glapi/glapi.o \ + ../../glapi/glapi_getproc.o \ + ../../glapi/glapi_dispatch.o \ ../../glapi/glapi_nop.o \ ../../glapi/glthread.o \ - ../../main/dispatch.o \ ../common/driverfuncs.o \ ../../libmesa.a |