X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=4ba0a32d66925440b72e718547a4fe25334c7a27;hb=2016e9ffda26aac6a65c363f38afc047b72d3e83;hp=38137ee9028d941daf98720a7035524697c1a96c;hpb=6d670f6c0f3b9383b8b4c8ed12beaeec56928266;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index 38137ee9028..4ba0a32d669 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,18 +1,41 @@
 Import('*')
 
+
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
-    SConscript('talloc/SConscript')
 
-SConscript('glsl/SConscript')
+SConscript('util/SConscript')
+SConscript('compiler/SConscript')
+
+if env['hostonly']:
+    # We are just compiling the things necessary on the host for cross
+    # 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')
+
+# Haiku C++ libGL dispatch (renderers depend on libgl)
+if env['platform'] in ['haiku']:
+    SConscript('hgl/SConscript')
+
 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'] == 'haiku':
+        SConscript('egl/SConscript')
 
-if env['platform'] != 'embedded':
-    SConscript('egl/main/SConscript')
-    SConscript('glut/glx/SConscript')
+    if env['gles']:
+        SConscript('mapi/shared-glapi/SConscript')
 
 SConscript('gallium/SConscript')