X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=188ab08b6aae587227f270fb5b1d8c826daf9625;hb=f1adc45dbe649cdd4538fb96f6d2a27328bbfba1;hp=f11894f2990a5709797d40ca42d267792318bd9e;hpb=b922a0ce12916a91cfc3e56714913fcf63279ff2;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index f11894f2990..188ab08b6aa 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,19 +12,31 @@ if env['hostonly']:
     # compilation
     Return()
 
+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
 # in mapi/glapi-shared/SConscript.  mesa/SConscript also adapts itself to
 # 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 env['platform'] != 'embedded':
-    SConscript('egl/main/SConscript')
-    SConscript('glut/glx/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']:
+        if env['dri']:
+            SConscript('egl/drivers/dri2/SConscript')
+        SConscript('egl/main/SConscript')
+    if env['platform'] == 'haiku':
+        SConscript('egl/drivers/haiku/SConscript')
+        SConscript('egl/main/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')