X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2FSConscript;h=1eee8761adb111e654b6eb714020f6d5f53ba844;hp=cd4896ada401935a25d97d798773981f86fe7b04;hb=88625e6e651a9afc3ed0f62837b7316960c9b2ae;hpb=dea98eb792b5a0637ff2067d9bfe2f666f01423e

diff --git a/src/SConscript b/src/SConscript
index cd4896ada40..1eee8761adb 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,13 +1,33 @@
 Import('*')
 
+
+if env['platform'] == 'windows':
+    SConscript('getopt/SConscript')
+
 SConscript('glsl/SConscript')
-SConscript('gallium/SConscript')
 
-if 'mesa' in env['statetrackers']:
-	SConscript('mesa/SConscript')
+if env['hostonly']:
+    # We are just compiling the things necessary on the host for cross
+    # compilation
+    Return()
+
+
+# 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/SConscript')
+SConscript('mesa/SConscript')
 
-SConscript('gallium/winsys/SConscript')
+SConscript('mapi/vgapi/SConscript')
+
+if not env['embedded']:
+    SConscript('glx/SConscript')
+    SConscript('egl/main/SConscript')
+    SConscript('glu/sgi/SConscript')
+
+    if env['gles']:
+        SConscript('mapi/shared-glapi/SConscript')
+
+SConscript('gallium/SConscript')
 
-if platform != 'embedded':
-	SConscript('glut/glx/SConscript')
-	SConscript('glew/SConscript')