build with the latest version of wlroots

4 files changed, 8 insertions, 3 deletions

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
+Subproject d305934ebe6852785a1f425ee96861f0b7280d7