mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request #1194 from ascent12/meson_feature"

Browse source 
This breaks wlroots when used as a meson subproject.

This reverts commit dea311992e, reversing
changes made to 6db9c4b746.
This commit is contained in:
Drew DeVault 2018-08-23 21:00:58 -04:00
parent dea311992e
commit 9c886f20b9
19 changed files with 227 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

6
render/meson.build
View file

@ -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],
)