diff options
| author | José Fonseca <jfonseca@vmware.com> | 2012-02-07 11:16:35 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2012-02-07 11:40:58 +0000 |
| commit | f763ad51302a8b3517e85ae7f2ee94d40b1e0326 (patch) | |
| tree | d7ba0322a1c743989681f90bc478612b77e3448f /src/gallium/SConscript | |
| parent | aed51e3e6a90dd667bd9915817d16ba14a79720c (diff) | |
scons: r300/r600 now depends on libdrm.
As they now indirectly include on libdrm/radeon_surface.h.
Diffstat (limited to 'src/gallium/SConscript')
| -rw-r--r-- | src/gallium/SConscript | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript index ae946377bd0..4413bc8742b 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -25,13 +25,13 @@ if not env['msvc']: # These drivers do not build on MSVC compilers SConscript([ 'drivers/i915/SConscript', - 'drivers/r300/SConscript', ]) if env['drm']: # These drivers depend on drm headers if env['drm_radeon']: SConscript([ + 'drivers/r300/SConscript', 'drivers/r600/SConscript', ]) # XXX: nouveau drivers have a tight dependency on libdrm, so to enable @@ -73,7 +73,43 @@ if not env['embedded']: # Winsys # -SConscript('winsys/SConscript') +SConscript([ + 'winsys/sw/wrapper/SConscript', +]) + +if env['x11']: + SConscript([ + 'winsys/sw/xlib/SConscript', + ]) + +if env['platform'] == 'windows': + SConscript([ + 'winsys/sw/gdi/SConscript', + ]) + +if not env['msvc']: + SConscript([ + 'winsys/i915/sw/SConscript', + ]) + +if env['dri']: + SConscript([ + 'winsys/sw/dri/SConscript', + ]) + + SConscript([ + 'winsys/svga/drm/SConscript', + ]) + + if env['drm_intel']: + SConscript([ + 'winsys/i915/drm/SConscript', + ]) + + if env['drm_radeon']: + SConscript([ + 'winsys/radeon/drm/SConscript', + ]) # # Targets |