From 40d7e46d3c072921a356f71cd81080c9ad64ecc2 Mon Sep 17 00:00:00 2001 From: Squibid Date: Mon, 10 Feb 2025 19:44:12 -0600 Subject: build with the latest version of wlroots --- .gitmodules | 3 +++ config.mk | 6 +++--- pre_build.sh | 2 ++ wlroots | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 100755 pre_build.sh create mode 160000 wlroots diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b0169c1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "wlroots"] + path = wlroots + url = https://gitlab.freedesktop.org/wlroots/wlroots diff --git a/config.mk b/config.mk index e2f1816..405f6c8 100644 --- a/config.mk +++ b/config.mk @@ -14,10 +14,10 @@ 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" -#WLR_INCS = -I/usr/include/pixman-1 -I/usr/include/elogind -I/usr/include/libdrm \ -# -I$(PWD)/wlroots/include +WLR_INCS = -I/usr/include/pixman-1 -I/usr/include/elogind -I/usr/include/libdrm \ +-I$(PWD)/wlroots/include # Set -rpath to avoid using the wrong library. -#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/build -L$(PWD)/wlroots/build -lwlroots-0.19 +WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/build -L$(PWD)/wlroots/build -lwlroots-0.19 # Assuming you ran "meson setup --prefix ${PWD}/0.19 build && ninja -C build install" #WLR_INCS = -I/usr/include/pixman-1 -I/usr/include/elogind -I/usr/include/libdrm \ diff --git a/pre_build.sh b/pre_build.sh new file mode 100755 index 0000000..226007b --- /dev/null +++ b/pre_build.sh @@ -0,0 +1,2 @@ +#!/bin/sh +(cd wlroots && meson setup build -Dwrap_mode=default && ninja -C build) diff --git a/wlroots b/wlroots new file mode 160000 index 0000000..d305934 --- /dev/null +++ b/wlroots @@ -0,0 +1 @@ +Subproject commit d305934ebe6852785a1f425ee96861f0b7280d76 -- cgit v1.2.1