summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/drm/i965/SConscript
diff options
context:
space:
mode:
authorYounes Manton <[email protected]>2010-03-07 12:47:45 -0500
committerYounes Manton <[email protected]>2010-03-12 01:37:49 -0500
commita8238bb08a95e7ea4430450c304a6bee210df1a6 (patch)
tree00f4e852473dc1d6a86aece436f3e5bf89d029c7 /src/gallium/winsys/drm/i965/SConscript
parent80468464897682b8e10aeab310f20fdd7ddc6cb4 (diff)
parent45df4bad9fc0379f05197bee10c03fd351f24094 (diff)
Merge remote branch 'origin/master' into pipe-video
Conflicts: configure.ac src/gallium/auxiliary/vl/Makefile src/gallium/auxiliary/vl/SConscript src/gallium/auxiliary/vl/vl_compositor.c src/gallium/auxiliary/vl/vl_compositor.h src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h src/gallium/drivers/nouveau/nouveau_winsys.h src/gallium/drivers/softpipe/sp_video_context.c src/gallium/include/pipe/p_video_state.h src/gallium/include/state_tracker/drm_api.h src/gallium/state_trackers/xorg/xvmc/surface.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.h src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/g3dvl/nouveau/Makefile
Diffstat (limited to 'src/gallium/winsys/drm/i965/SConscript')
-rw-r--r--src/gallium/winsys/drm/i965/SConscript7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/winsys/drm/i965/SConscript b/src/gallium/winsys/drm/i965/SConscript
new file mode 100644
index 00000000000..50d7b75ed68
--- /dev/null
+++ b/src/gallium/winsys/drm/i965/SConscript
@@ -0,0 +1,7 @@
+Import('*')
+
+SConscript(['gem/SConscript',])
+
+if 'mesa' in env['statetrackers']:
+
+ SConscript(['dri/SConscript'])