X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2FSConscript;h=3e6baa094c11a9d0396697ed88eed3bf544ad182;hp=777ad23f2c904104b1d0cc4133914bd55f8708ea;hb=HEAD;hpb=bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a

diff --git a/src/SConscript b/src/SConscript
index 777ad23f2c9..3e6baa094c1 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,10 +1,15 @@
-Import('*')
+import filecmp
+import os
+import subprocess
+from sys import executable as python_cmd
 
+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
@@ -12,25 +17,34 @@ if env['hostonly']:
     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')
+def write_git_sha1_h_file(filename):
+    """Mesa looks for a git_sha1.h file at compile time in order to display
+    the current git hash id in the GL_VERSION string.  This function tries
+    to retrieve the git hashid and write the header file.  An empty file
+    will be created if anything goes wrong."""
+
+    args = [ python_cmd, Dir('#').abspath + '/bin/git_sha1_gen.py', '--output', filename ]
+    try:
+        subprocess.call(args)
+    except:
+        print("Warning: exception in write_git_sha1_h_file()")
+        return
+
 
-SConscript('mapi/vgapi/SConscript')
+# Create the git_sha1.h header file
+write_git_sha1_h_file("git_sha1.h")
+# and update CPPPATH so the git_sha1.h header can be found
+env.Append(CPPPATH = ["#" + env['build_dir']])
 
-if not env['embedded']:
-    if env['platform'] not in ['windows', 'darwin', 'haiku']:
-        SConscript('glx/SConscript')
-    if env['platform'] not in ['darwin', 'haiku', 'sunos']:
-        SConscript('egl/main/SConscript')
-    if env['platform'] not in ['darwin']:
-        SConscript('glu/sgi/SConscript')
 
-    if env['gles']:
-        SConscript('mapi/shared-glapi/SConscript')
+
+if env['platform'] != 'windows':
+    SConscript('loader/SConscript')
+
+SConscript('mapi/glapi/gen/SConscript')
+SConscript('mapi/glapi/SConscript')
+
+SConscript('mesa/SConscript')
 
 SConscript('gallium/SConscript')