diff options
| author | José Fonseca <[email protected]> | 2010-01-16 23:21:06 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2010-01-16 23:21:06 +0000 |
| commit | ba5d600c90f7075cf2c33a0c5c679ef822e8746e (patch) | |
| tree | ec6794fba9f2fe563a8bbc03ca06e288b7f51c28 /src/mesa/Makefile | |
| parent | fdfe06ad804ea13e6e436d66c1bcafe0bde2f545 (diff) | |
| parent | 164fd16cfbc09970676c2e6866e062a5c9b410db (diff) | |
Merge remote branch 'origin/master' into lp-binning
Conflicts:
src/gallium/drivers/llvmpipe/lp_quad.h
src/gallium/drivers/llvmpipe/lp_setup.c
Diffstat (limited to 'src/mesa/Makefile')
| -rw-r--r-- | src/mesa/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index a815f46b4a1..f845d93fbd3 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -42,7 +42,7 @@ libglapi.a: $(GLAPI_OBJECTS) ###################################################################### # Device drivers -driver_subdirs: libmesa.a libglapi.a +driver_subdirs: libmesa.a libglapi.a libmesagallium.a @ (cd drivers && $(MAKE)) |