X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=106b87d42512fbfbef73d62291ccdfdd64f1ab61;hb=8e9968f184dd1f9727d1095aa45936d5c6ec9f16;hp=75c444677b3077892c5242e7b9acc6511d08c347;hpb=dff36e900c645401b26c9a44106459e96ee7a24d;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index 75c444677b3..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,6 +12,8 @@ if env['hostonly']:
     # compilation
     Return()
 
+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
@@ -18,17 +21,18 @@ if env['hostonly']:
 # enable OpenGL ES support.
 SConscript('mapi/glapi/gen/SConscript')
 SConscript('mapi/glapi/SConscript')
-SConscript('mesa/SConscript')
 
-SConscript('mapi/vgapi/SConscript')
+# Haiku C++ libGL dispatch (renderers depend on libgl)
+if env['platform'] in ['haiku']:
+    SConscript('hgl/SConscript')
+
+SConscript('mesa/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'] not in ['darwin']:
-        SConscript('glu/sgi/SConscript')
+    if env['platform'] == 'haiku':
+        SConscript('egl/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')