On Fri, 16 Feb 2018 16:22:31 +0000 Emil Velikov <emil.l.veli...@gmail.com> wrote:
> From: Emil Velikov <emil.veli...@collabora.com> > > The core wayland interfaces are public, via the libwayland-server and > libwayland-client DSOs. Hence use "public-code" cmdline option, instead > of the deprecated code". > > As the host wayland-scanner may not know about the new option, use the > legacy "code". > > Signed-off-by: Emil Velikov <emil.veli...@collabora.com> > --- > Makefile.am | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > index 322d6b8..4ffce0d 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -95,7 +95,11 @@ nodist_libwayland_client_la_SOURCES = \ > pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc > > protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml > +if USE_HOST_SCANNER > $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code $< $@ > +else > + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) public-code $< $@ > +endif > > protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml > $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header $< > $@ Hi, personally I would be ok requiring the exact same wayland-scanner version as what libwayland one is building, but we never explicitly enforced that. Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> Thanks, pq
pgpy14kGehpdr.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
