mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tinywl: stop generating xdg-shell header

Browse source 
We don't need to do this anymore for wayland-protocols.
This commit is contained in:
Simon Ser 2025-08-16 19:21:17 +02:00 • committed by Simon Zeni
parent 7bf5ff4c02
commit bbd9a49bdf
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tinywl/Makefile
View file

@ -1,6 +1,4 @@
PKG_CONFIG?=pkg-config PKG_CONFIG?=pkg-config
WAYLAND_PROTOCOLS!=$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols
WAYLAND_SCANNER!=$(PKG_CONFIG) --variable=wayland_scanner wayland-scanner
PKGS="wlroots-0.20" wayland-server xkbcommon PKGS="wlroots-0.20" wayland-server xkbcommon
CFLAGS_PKG_CONFIG!=$(PKG_CONFIG) --cflags $(PKGS) CFLAGS_PKG_CONFIG!=$(PKG_CONFIG) --cflags $(PKGS)
@ -9,19 +7,12 @@ LIBS!=$(PKG_CONFIG) --libs $(PKGS)
all: tinywl all: tinywl
# wayland-scanner is a tool which generates C headers and rigging for Wayland tinywl.o: tinywl.c
# protocols, which are specified in XML. wlroots requires you to rig these up
# to your build system yourself and provide them in the include path.
xdg-shell-protocol.h:
$(WAYLAND_SCANNER) server-header \
$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
tinywl.o: tinywl.c xdg-shell-protocol.h
$(CC) -c $< -g -Werror $(CFLAGS) -I. -DWLR_USE_UNSTABLE -o $@ $(CC) -c $< -g -Werror $(CFLAGS) -I. -DWLR_USE_UNSTABLE -o $@
tinywl: tinywl.o tinywl: tinywl.o
$(CC) $^ $> -g -Werror $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $(CC) $^ $> -g -Werror $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@
clean: clean:
rm -f tinywl tinywl.o xdg-shell-protocol.h rm -f tinywl tinywl.o
.PHONY: all clean .PHONY: all clean

2
tinywl/meson.build
View file

@ -1,5 +1,5 @@
executable( executable(
'tinywl', 'tinywl',
['tinywl.c', protocols_server_header['xdg-shell']], 'tinywl.c',
dependencies: wlroots, dependencies: wlroots,
) )