diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-23 21:00:58 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-08-23 21:00:58 -0400 |
| commit | 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 (patch) | |
| tree | 7376c651ff0c75daf64bbc086858239a1d51f50b /render | |
| parent | dea311992eb4ff3e343c3cf5b0603034223d2a42 (diff) | |
Revert "Merge pull request #1194 from ascent12/meson_feature"
This breaks wlroots when used as a meson subproject.
This reverts commit dea311992eb4ff3e343c3cf5b0603034223d2a42, reversing
changes made to 6db9c4b74667c1d917d720f5e96985a2461569fb.
Diffstat (limited to 'render')
| -rw-r--r-- | render/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/render/meson.build b/render/meson.build index c5401d22..4b90c229 100644 --- a/render/meson.build +++ b/render/meson.build @@ -1,7 +1,6 @@ glgen = find_program('../glgen.sh') -glapi = custom_target( - 'glapi', +glapi = custom_target('glapi', input: 'glapi.txt', output: ['@BASENAME@.c', '@BASENAME@.h'], command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'], @@ -20,7 +19,8 @@ lib_wlr_render = static_library( 'wlr_renderer.c', 'wlr_texture.c', ), - glapi, + glapi[0], + glapi[1], include_directories: wlr_inc, dependencies: [egl, glesv2, pixman, wayland_server], ) |