diff --git a/.gitmodules b/.gitmodules index 887b1f9..0235ef9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ -[submodule "external/wlroots"] - path = external/wlroots - url = https://github.com/swaywm/wlroots.git +[submodule "external/wlr-protocols"] + path = external/wlr-protocols + url = https://github.com/swaywm/wlr-protocols.git + branch = master diff --git a/bar/CMakeLists.txt b/bar/CMakeLists.txt index e57442b..9ee2d33 100644 --- a/bar/CMakeLists.txt +++ b/bar/CMakeLists.txt @@ -43,7 +43,7 @@ if (ENABLE_WAYLAND) wayland_protocol( wayland_protos - ${PROJECT_SOURCE_DIR}/external/wlroots/protocol/wlr-layer-shell-unstable-v1.xml + ${PROJECT_SOURCE_DIR}/external/wlr-protocols/unstable/wlr-layer-shell-unstable-v1.xml ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml ) diff --git a/external/wlr-protocols b/external/wlr-protocols new file mode 160000 index 0000000..4ff1cda --- /dev/null +++ b/external/wlr-protocols @@ -0,0 +1 @@ +Subproject commit 4ff1cda832e46fa4c433bbfebb8179f095e60150 diff --git a/external/wlroots b/external/wlroots deleted file mode 160000 index 59d1b67..0000000 --- a/external/wlroots +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 59d1b6790dd187c2e110e98a2fa17c1fbfee40ca