diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-10 12:06:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-10 12:06:59 +1100 |
| commit | 5c1a5b504705214fd5e90b33bb3034e75f6b5994 (patch) | |
| tree | ac6e3bd4cb94979ad1fce57a3fd01249253ef3ae /src/mesa/pipe/Makefile | |
| parent | 1a3987240a547ba6e625c864f10a033858de4c65 (diff) | |
| parent | f8f9580a2a1c89af1dc0e169b62440053d9d7e81 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
src/mesa/pipe/Makefile
src/mesa/pipe/draw/draw_vertex_fetch.c
src/mesa/pipe/i915simple/i915_texture.c
src/mesa/pipe/softpipe/sp_texture.c
src/mesa/pipe/xlib/xm_winsys.c
src/mesa/state_tracker/st_cb_fbo.c
Diffstat (limited to 'src/mesa/pipe/Makefile')
| -rw-r--r-- | src/mesa/pipe/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/pipe/Makefile b/src/mesa/pipe/Makefile index 5099b65885..e4b72e4940 100644 --- a/src/mesa/pipe/Makefile +++ b/src/mesa/pipe/Makefile @@ -1,4 +1,3 @@ - TOP = ../../.. include $(TOP)/configs/current @@ -7,7 +6,7 @@ ifeq ($(CONFIG_NAME), linux-cell) CELL_DIR = cell endif -SUBDIRS = softpipe i915simple nv40 nv50 failover $(CELL_DIR) +SUBDIRS = softpipe i915simple nv40 nv50 failover pipebuffer $(CELL_DIR) default: subdirs |