diff options
| author | Andre Maasikas <[email protected]> | 2009-12-08 11:57:24 +0200 |
|---|---|---|
| committer | Andre Maasikas <[email protected]> | 2009-12-08 11:57:24 +0200 |
| commit | b5e256c76dea2182c82af2a4f66224735701d55a (patch) | |
| tree | 42ab2283fc94ab3deefc30983aaa10f283897dd6 /src/gallium/drivers/r300 | |
| parent | ac66598ed8bc218720cf2a1a7493b7e25ca9d962 (diff) | |
| parent | 0d4a05445c6b47b93269a3829afbe509ffec4817 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
Diffstat (limited to 'src/gallium/drivers/r300')
| -rw-r--r-- | src/gallium/drivers/r300/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/Makefile b/src/gallium/drivers/r300/Makefile index 63ae5c2766a..9c9fc6f64b3 100644 --- a/src/gallium/drivers/r300/Makefile +++ b/src/gallium/drivers/r300/Makefile @@ -36,4 +36,4 @@ include ../../Makefile.template .PHONY : $(COMPILER_ARCHIVE) $(COMPILER_ARCHIVE): - cd $(TOP)/src/mesa/drivers/dri/r300/compiler; make + $(MAKE) -C $(TOP)/src/mesa/drivers/dri/r300/compiler |