diff options
| author | Emil Velikov <[email protected]> | 2018-11-20 17:30:47 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2019-01-24 18:13:25 +0000 |
| commit | 0842bc879b34414de54be9a2299ea8cdb0ecde5e (patch) | |
| tree | a2a170823afb5dfcfadc469b3c05152c9e46b184 /src/mapi | |
| parent | 656845301d67d1726260a8b227f3e65ce3fcd0b1 (diff) | |
meson: wire the new generator for es1 and es2
v2: use ${foo})_py naming (Dylan)
v3: use symbolic name for genCommon.py
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Erik Faye-Lund <[email protected]> (v2)
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/es1api/meson.build | 6 | ||||
| -rw-r--r-- | src/mapi/es2api/meson.build | 6 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/meson.build | 7 | ||||
| -rw-r--r-- | src/mapi/meson.build | 1 |
4 files changed, 14 insertions, 6 deletions
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build index 53e894f091c..b0416e705a1 100644 --- a/src/mapi/es1api/meson.build +++ b/src/mapi/es1api/meson.build @@ -20,10 +20,10 @@ es1_glapi_mapi_tmp_h = custom_target( 'es1_glapi_mapi_tmp.h', - input : [mapi_abi_py, gl_and_es_api_files], + input : [glapi_gen_mapi_py, glapi_gen_gl_xml], output : 'glapi_mapi_tmp.h', - command : [prog_python, '@INPUT0@', '--printer', 'es1api', '@INPUT1@'], - depend_files : api_xml_files, + command : [prog_python, '@INPUT0@', 'glesv1', '@INPUT1@'], + depend_files : glapi_gen_mapi_deps, capture : true, ) diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build index 1f397e2b752..a7f0904b699 100644 --- a/src/mapi/es2api/meson.build +++ b/src/mapi/es2api/meson.build @@ -20,10 +20,10 @@ es2_glapi_mapi_tmp_h = custom_target( 'es2_glapi_mapi_tmp.h', - input : [mapi_abi_py, gl_and_es_api_files], + input : [glapi_gen_mapi_py, glapi_gen_gl_xml], output : 'glapi_mapi_tmp.h', - command : [prog_python, '@INPUT0@', '--printer', 'es2api', '@INPUT1@'], - depend_files : api_xml_files, + command : [prog_python, '@INPUT0@', 'glesv2', '@INPUT1@'], + depend_files : glapi_gen_mapi_deps, capture : true, ) diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 8cc163b2989..ecfa1a7f77e 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -18,6 +18,13 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +glapi_gen_gl_xml = files('../registry/gl.xml') +glapi_gen_mapi_deps = [ + glapi_gen_gl_xml, + genCommon_py, + glapi_gen_gl_xml, +] + gl_and_es_api_files = files('gl_and_es_API.xml') api_xml_files = files( diff --git a/src/mapi/meson.build b/src/mapi/meson.build index 24013c65542..3e79bbaa7aa 100644 --- a/src/mapi/meson.build +++ b/src/mapi/meson.build @@ -26,6 +26,7 @@ files_mapi_util = files( ) genCommon_py = files('new/genCommon.py') +glapi_gen_mapi_py = files('new/gen_gldispatch_mapi.py') mapi_abi_py = files('mapi_abi.py') subdir('glapi') |