X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=eb4cd3c7c9f1d3de94dc45fe78fcded598f2644c;hb=400b833592d9aad7b2c4627a897380642d52189f;hp=201812c5ac3f1199c79c50ff34c203724f28278a;hpb=652901e95b4ed406293d0e1fabee857c054119b1;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index 201812c5ac3..eb4cd3c7c9f 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,21 +1,46 @@
 Import('*')
 
+
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
-    SConscript('talloc/SConscript')
-else:
-    talloc = 'talloc'
-    Export('talloc')
 
+SConscript('util/SConscript')
 SConscript('glsl/SConscript')
+
+if env['hostonly']:
+    # We are just compiling the things necessary on the host for cross
+    # 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')
+
+# Haiku C++ libGL dispatch (renderers depend on libgl)
+if env['platform'] in ['haiku']:
+    SConscript('hgl/SConscript')
+
 SConscript('mesa/SConscript')
 
 SConscript('mapi/vgapi/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']:
+        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')
 
 SConscript('gallium/SConscript')