From 3bf08292d2278e06edc73a7a3e29c8f44c8dfa53 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 20 Nov 2018 17:44:43 +0000 Subject: [PATCH] scons: wire the new generator for es1 and es2 Signed-off-by: Emil Velikov Reviewed-by: Erik Faye-Lund --- src/mapi/shared-glapi/SConscript | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript index 060c61dadce..81aea74873d 100644 --- a/src/mapi/shared-glapi/SConscript +++ b/src/mapi/shared-glapi/SConscript @@ -27,13 +27,27 @@ def mapi_objects(env, printer, mode): # generate ABI header GLAPI = '../glapi/' - header = env.CodeGenerate( - target = header_name, - script = '../mapi_abi.py', - source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'), - command = python_cmd + ' $SCRIPT ' + \ - '--printer %s $SOURCE > $TARGET' % (printer), - ) + if printer != 'glapi': + if printer == 'es1api': + abi_tag = 'glesv1' + else: + abi_tag = 'glesv2' + + header = env.CodeGenerate( + target = header_name, + script = '../new/gen_gldispatch_mapi.py', + source = GLAPI + 'registry/gl.xml' + command = python_cmd + ' $SCRIPT ' + \ + '%s $SOURCE > $TARGET' % (abi_tag), + ) + else: + header = env.CodeGenerate( + target = header_name, + script = '../mapi_abi.py', + source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'), + command = python_cmd + ' $SCRIPT ' + \ + '--printer %s $SOURCE > $TARGET' % (printer), + ) cpppath = [ header[0].dir, -- 2.30.2