Android: clean-up and fix DRI module path handling

[mesa.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index 91d1253adfda1c6e2245b82ad609cee7e5518f57..4ba0a32d66925440b72e718547a4fe25334c7a27 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -4,28 +4,35 @@ Import('*')
 if env['platform'] == 'windows':
     SConscript('getopt/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')
-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 not env['embedded']:
-    if env['platform'] not in ['windows', 'darwin']:
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
         SConscript('glx/SConscript')
-        SConscript('egl/main/SConscript')
-        SConscript('glu/sgi/SConscript')
+    if env['platform'] == 'haiku':
+        SConscript('egl/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')