Merge branch 'wlroots-next'
This commit is contained in:
		
							
								
								
									
										8
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								Makefile
									
									
									
									
									
								
							| @@ -12,7 +12,7 @@ DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement \ | ||||
| 	-Wfloat-conversion | ||||
|  | ||||
| # CFLAGS / LDFLAGS | ||||
| PKGS      = wlroots wayland-server xkbcommon libinput $(XLIBS) | ||||
| PKGS      = wlroots-0.18 wayland-server xkbcommon libinput $(XLIBS) | ||||
| DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS) | ||||
| LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` -lm $(LIBS) | ||||
|  | ||||
| @@ -31,13 +31,13 @@ WAYLAND_SCANNER   = `$(PKG_CONFIG) --variable=wayland_scanner wayland-scanner` | ||||
| WAYLAND_PROTOCOLS = `$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols` | ||||
|  | ||||
| cursor-shape-v1-protocol.h: | ||||
| 	$(WAYLAND_SCANNER) server-header \ | ||||
| 	$(WAYLAND_SCANNER) enum-header \ | ||||
| 		$(WAYLAND_PROTOCOLS)/staging/cursor-shape/cursor-shape-v1.xml $@ | ||||
| pointer-constraints-unstable-v1-protocol.h: | ||||
| 	$(WAYLAND_SCANNER) server-header \ | ||||
| 	$(WAYLAND_SCANNER) enum-header \ | ||||
| 		$(WAYLAND_PROTOCOLS)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml $@ | ||||
| wlr-layer-shell-unstable-v1-protocol.h: | ||||
| 	$(WAYLAND_SCANNER) server-header \ | ||||
| 	$(WAYLAND_SCANNER) enum-header \ | ||||
| 		protocols/wlr-layer-shell-unstable-v1.xml $@ | ||||
| wlr-output-power-management-unstable-v1-protocol.h: | ||||
| 	$(WAYLAND_SCANNER) server-header \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user