Android: Fixes for Q and R

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index eaf23fbae1865b2fe99c7a3b8b60420f7a86a588..bba4101ea58354960c1f005e14c97d18d5b38cdf 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -103,30 +103,14 @@ if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
     else:
         pass
 
-    # Generate matypes.h
-    if env['machine'] in ('x86', 'x86_64'):
-        # See http://www.scons.org/wiki/UsingCodeGenerators
-        gen_matypes = env.Program(
-            target = 'gen_matypes',
-            source = 'x86/gen_matypes.c',
-        )
-        matypes = env.Command(
-            'matypes.h',
-            gen_matypes,
-            gen_matypes[0].abspath + ' > $TARGET',
-        )
-        # Add the dir containing the generated header (somewhere inside  the
-        # build dir) to the include path
-        env.Prepend(CPPPATH = [matypes[0].dir])
-
-
 # The marshal_generated.c file is generated from the GL/ES API.xml file
-env.CodeGenerate(
-    target = 'main/marshal_generated.c',
-    script = GLAPI + 'gen/gl_marshal.py',
-    source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
-    command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
-    )
+for i in range(8):
+    env.CodeGenerate(
+        target = 'main/marshal_generated{0}.c'.format(i),
+        script = GLAPI + 'gen/gl_marshal.py',
+        source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
+        command = python_cmd + ' $SCRIPT -f $SOURCE -i {0} -n 8 > $TARGET'.format(i)
+        )
 
 # The marshal_generated.h file is generated from the GL/ES API.xml file
 env.CodeGenerate(
@@ -148,5 +132,3 @@ mesa = env.ConvenienceLibrary(
 env.Alias('mesa', mesa)
 
 Export('mesa')
-
-SConscript('drivers/SConscript')