KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: move wayland_drm_protocol generation to wayland-drm 

These files are needed by both vulkan wayland-wsi and by egl
wayland-wsi, since the XML file is in src/egl/wayland/wayland-drm and we
can include this directory in such a way that it will be loaded before
egl and vulkan this allows us to avoid multiple calls to the same
generator.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-and-Tested-by: Eric Engestrom <eric@engestrom.ch>
This commit is contained in:
Dylan Baker 2017-10-17 15:02:58 -07:00
parent 8d3b1210cb
commit ddf06a05ad
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/egl/wayland/wayland-drm/meson.build
View File

@ -18,4 +18,16 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
wayland_drm_xml = files('wayland-drm.xml')
wayland_drm_protocol_c = custom_target(
'wayland-drm-protocol.c',
input : 'wayland-drm.xml',
output : 'wayland-drm-protocol.c',
command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
)
wayland_drm_client_protocol_h = custom_target(
'wayland-drm-client-protocol.h',
input : 'wayland-drm.xml',
output : 'wayland-drm-client-protocol.h',
command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
)

14
src/vulkan/wsi/meson.build
View File

@ -18,20 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
wayland_drm_protocol_c = custom_target(
'wayland-drm-protocol.c',
input : wayland_drm_xml,
output : 'wayland-drm-protocol.c',
command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
)
wayland_drm_client_protocol_h = custom_target(
'wayland-drm-client-protocol.h',
input : wayland_drm_xml,
output : 'wayland-drm-client-protocol.h',
command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
)
vulkan_wsi_args = []
vulkan_wsi_deps = []