From 54f207839f686a44918cfc581b15ff153215ee9c Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Sun, 8 Sep 2024 20:51:41 +0200 Subject: [PATCH] reorder config.mk variables By placing the default WLR_INCS and WLR_LIBS before the ones for an alternative wlroots, they don't need to be commented to enable the alternative ones. --- config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index e374ccb..e2f1816 100644 --- a/config.mk +++ b/config.mk @@ -8,6 +8,9 @@ PREFIX = /usr/local MANDIR = $(PREFIX)/share/man DATADIR = $(PREFIX)/share +WLR_INCS = `$(PKG_CONFIG) --cflags wlroots-0.19` +WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19` + # Allow using an alternative wlroots installations # This has to have all the includes required by wlroots, e.g: # Assuming wlroots git repo is "${PWD}/wlroots" and you only ran "meson setup build && ninja -C build" @@ -21,9 +24,6 @@ DATADIR = $(PREFIX)/share # -I$(PWD)/wlroots/0.19/include/wlroots-0.19 #WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19 -WLR_INCS = `$(PKG_CONFIG) --cflags wlroots-0.19` -WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19` - XWAYLAND = XLIBS = # Uncomment to build XWayland support