scons: Updates for targets/egl-static.

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9436b684e4e744ef66a25c39ada42335838229e5..2265f1de46c44a3242ce8e8e83499e9a0dd1d705 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -54,11 +54,17 @@ SConscript('winsys/sw/null/SConscript')
 
 SConscript('state_trackers/python/SConscript')
 if env['platform'] != 'embedded':
-    SConscript('state_trackers/glx/xlib/SConscript')
-    SConscript('state_trackers/dri/SConscript')
-    SConscript('state_trackers/xorg/SConscript')
-    SConscript('state_trackers/egl/SConscript')
     SConscript('state_trackers/vega/SConscript')
+    SConscript('state_trackers/egl/SConscript')
+
+    if env['x11']:
+        SConscript('state_trackers/glx/xlib/SConscript')
+
+    if env['dri']:
+        SConscript('state_trackers/dri/SConscript')
+
+    if env['dri'] and env['xorg']:
+        SConscript('state_trackers/xorg/SConscript')
 
 if env['platform'] == 'windows':
     SConscript('state_trackers/wgl/SConscript')
@@ -77,6 +83,11 @@ SConscript([
     'targets/graw-null/SConscript',
 ])
 
+if env['platform'] != 'embedded':
+    SConscript([
+        'targets/egl-static/SConscript'
+    ])
+
 if env['x11']:
     SConscript([
         'targets/graw-xlib/SConscript',
@@ -87,7 +98,6 @@ if env['platform'] == 'windows':
     SConscript([
         'targets/graw-gdi/SConscript',
         'targets/libgl-gdi/SConscript',
-        #'egl-gdi/SConscript',
     ])
 
 if env['dri']:
@@ -108,7 +118,7 @@ if env['dri']:
             'targets/dri-r600/SConscript',
         ])
 
-if env['xorg']:
+if env['xorg'] and env['drm']:
     SConscript([
         #'targets/xorg-i915/SConscript',
         #'targets/xorg-i965/SConscript',