diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
| commit | 112d89481850102f28b6e7ff4f40b65c41e11f6c (patch) | |
| tree | 9e22963aeda3f588d4aa3aa270fdba74922028c7 /mesalib/src/gallium/SConscript | |
| parent | bcb354180f20f0c410a77bd32cbf2c1e799632d5 (diff) | |
| parent | 6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (diff) | |
| download | vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.gz vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.bz2 vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/gallium/SConscript')
| -rw-r--r-- | mesalib/src/gallium/SConscript | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/mesalib/src/gallium/SConscript b/mesalib/src/gallium/SConscript index cb6172007..98d017e4d 100644 --- a/mesalib/src/gallium/SConscript +++ b/mesalib/src/gallium/SConscript @@ -22,34 +22,14 @@ SConscript([ ]) # -# State trackers -# - -# Needed by some state trackers -SConscript('winsys/sw/null/SConscript') - -if not env['embedded']: - SConscript('state_trackers/vega/SConscript') - if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'): - SConscript('state_trackers/egl/SConscript') - - if env['x11']: - SConscript('state_trackers/glx/xlib/SConscript') - - if env['dri']: - SConscript('state_trackers/dri/SConscript') - - if env['platform'] == 'windows': - SConscript('state_trackers/wgl/SConscript') - -# # Winsys -# +# SConscript([ + 'winsys/sw/null/SConscript', 'winsys/sw/wrapper/SConscript', ]) - + if env['x11']: SConscript([ 'winsys/sw/xlib/SConscript', @@ -68,18 +48,13 @@ if env['platform'] == 'haiku': if env['dri']: SConscript([ 'winsys/sw/dri/SConscript', - ]) - - SConscript([ 'winsys/sw/kms-dri/SConscript', - ]) - - SConscript([ 'winsys/svga/drm/SConscript', ]) + # -# Targets +# State trackers and targets # SConscript([ @@ -87,19 +62,23 @@ SConscript([ ]) if not env['embedded']: + SConscript('state_trackers/vega/SConscript') if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'): SConscript([ - 'targets/egl-static/SConscript' + 'state_trackers/egl/SConscript', + 'targets/egl-static/SConscript', ]) if env['x11']: SConscript([ + 'state_trackers/glx/xlib/SConscript', 'targets/graw-xlib/SConscript', 'targets/libgl-xlib/SConscript', ]) if env['platform'] == 'windows': SConscript([ + 'state_trackers/wgl/SConscript', 'targets/graw-gdi/SConscript', 'targets/libgl-gdi/SConscript', ]) @@ -111,6 +90,7 @@ if not env['embedded']: if env['dri']: SConscript([ + 'state_trackers/dri/SConscript', 'targets/dri/SConscript', ]) |