X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=106b87d42512fbfbef73d62291ccdfdd64f1ab61;hb=2e533ab74be1f997ddfaaf01798e7e3018138ac2;hp=f11894f2990a5709797d40ca42d267792318bd9e;hpb=982609f4cf2afc4e0afd450aa24907986bca41ab;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index f11894f2990..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,19 +12,27 @@ 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
 # 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'] == 'haiku':
+        SConscript('egl/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')