diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-11-21 20:13:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 20:13:53 -0500 |
| commit | e6bf92cf02be8587e14d32f214467b09da40d9ff (patch) | |
| tree | bd97f7f7ff9951349e2e3059a0f0e279fc2f6f4d /render | |
| parent | b8a2bfbc73a7e21010469c95538cc39c559dbed8 (diff) | |
| parent | 02374b945d26b094ba7cd771841f967c7b83c956 (diff) | |
Merge pull request #443 from ascent12/meson-glapi
Change glapi.sh to generate both source and header simeltaneously
Diffstat (limited to 'render')
| -rw-r--r-- | render/meson.build | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/render/meson.build b/render/meson.build index 749d1393..1eea9a83 100644 --- a/render/meson.build +++ b/render/meson.build @@ -1,14 +1,9 @@ glgen = find_program('../glgen.sh') -glapi_c = custom_target('glapi.c', +glapi = custom_target('glapi', input: 'glapi.txt', - output: '@BASENAME@.c', - command: [glgen, '@INPUT@', '@OUTPUT@'], -) -glapi_h = custom_target('glapi.h', - input: 'glapi.txt', - output: '@BASENAME@.h', - command: [glgen, '@INPUT@', '@OUTPUT@'], + output: ['@BASENAME@.c', '@BASENAME@.h'], + command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'], ) lib_wlr_render = static_library( @@ -24,13 +19,13 @@ lib_wlr_render = static_library( 'wlr_renderer.c', 'wlr_texture.c', ), - glapi_c, - glapi_h, + glapi[0], + glapi[1], include_directories: wlr_inc, dependencies: [glesv2, egl], ) wlr_render = declare_dependency( link_with: lib_wlr_render, - sources: glapi_h, + sources: glapi[1], ) |