X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=93a490dca86782903981349a02d1ccacd20ed9fe;hb=b3e4b769dd318936abc38acbbbdec61ae2539e84;hp=06c6f94bf0c2c9c17a9a55895d1c05976e19ad2f;hpb=bb770af3a59e5935c108c05ee45490fc5668d4a3;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index 06c6f94bf0c..93a490dca86 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,25 +1,38 @@
 Import('*')
 
+
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
-    SConscript('talloc/SConscript')
-else:
-    talloc = 'talloc'
-    Export('talloc')
 
 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/main/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')