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.
This commit is contained in:
parent
9c05b9622c
commit
54f207839f
@ -8,6 +8,9 @@ PREFIX = /usr/local
|
|||||||
MANDIR = $(PREFIX)/share/man
|
MANDIR = $(PREFIX)/share/man
|
||||||
DATADIR = $(PREFIX)/share
|
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
|
# Allow using an alternative wlroots installations
|
||||||
# This has to have all the includes required by wlroots, e.g:
|
# 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"
|
# 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
|
# -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_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 =
|
XWAYLAND =
|
||||||
XLIBS =
|
XLIBS =
|
||||||
# Uncomment to build XWayland support
|
# Uncomment to build XWayland support
|
||||||
|
Loading…
Reference in New Issue
Block a user