X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=106b87d42512fbfbef73d62291ccdfdd64f1ab61;hb=89759381dbfe3784bc780a3ab6e0fe13e77e06ef;hp=93a490dca86782903981349a02d1ccacd20ed9fe;hpb=8c2e7fd8460750543367053b1be9368cc38e1d6a;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index 93a490dca86..106b87d4251 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -4,6 +4,7 @@ Import('*')
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
 
+SConscript('util/SConscript')
 SConscript('glsl/SConscript')
 
 if env['hostonly']:
@@ -11,7 +12,8 @@ if env['hostonly']:
     # compilation
     Return()
 
-SConscript('loader/SConscript')
+if env['platform'] != 'windows':
+    SConscript('loader/SConscript')
 
 # When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not
 # used.  libgl-xlib and libgl-gdi adapt themselves to use the targets defined
@@ -26,13 +28,11 @@ if env['platform'] in ['haiku']:
 
 SConscript('mesa/SConscript')
 
-SConscript('mapi/vgapi/SConscript')
-
 if not env['embedded']:
     if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
         SConscript('glx/SConscript')
-    if env['platform'] not in ['darwin', 'haiku', 'sunos']:
-        SConscript('egl/main/SConscript')
+    if env['platform'] == 'haiku':
+        SConscript('egl/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')