diff options
| author | Dylan Baker <[email protected]> | 2017-10-17 15:02:58 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-10-20 16:46:48 -0700 |
| commit | ddf06a05ad32118854136f9ad0bc2a38f41e6430 (patch) | |
| tree | 57cfd26c8187d35ae13c6187cbcfe66fef143c64 | |
| parent | 8d3b1210cb2bb590c9af880dab087f27c64b88c3 (diff) | |
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 <[email protected]>
Reviewed-and-Tested-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | src/egl/wayland/wayland-drm/meson.build | 14 | ||||
| -rw-r--r-- | src/vulkan/wsi/meson.build | 14 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/egl/wayland/wayland-drm/meson.build b/src/egl/wayland/wayland-drm/meson.build index 0a94626f287..92adc295531 100644 --- a/src/egl/wayland/wayland-drm/meson.build +++ b/src/egl/wayland/wayland-drm/meson.build @@ -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@'], +) diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index c42af8e4cde..3aa02d5e63f 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -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 = [] |