diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..71d3247f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "xdg-desktop-portal-wlr"] + path = xdg-desktop-portal-wlr + url = https://github.com/waycrate/xdg-desktop-portal-wlr diff --git a/Makefile b/Makefile index 0290ceae..783ed9e8 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,11 @@ MAN7_DIR := /usr/share/man/man7 all: build build: + @$(MAKE) -C ./xdg-desktop-portal-wlr/ -s $@ @cargo build $(BUILDFLAGS) run: + @$(MAKE) -C ./xdg-desktop-portal-wlr/ -s $@ & @cargo run install: build @@ -19,19 +21,23 @@ install: build @chmod +x $(TARGET_DIR)/$(BINARY) @find ./docs -type f -iname "*.1.gz" -exec cp {} $(MAN1_DIR) \; @find ./docs -type f -iname "*.7.gz" -exec cp {} $(MAN7_DIR) \; + @$(MAKE) -C ./xdg-desktop-portal-wlr/ -s $@ uninstall: @rm -f $(TARGET_DIR)/$(BINARY) @rm -f /usr/share/man/**/wayshot.* + @$(MAKE) -C ./xdg-desktop-portal-wlr/ -s $@ check: @cargo fmt @cargo check @cargo clippy + @$(MAKE) -C ./xdg-desktop-portal-wlr/ -s $@ clean: @cargo clean @rm -f ./docs/*.1.gz + @$(MAKE) -C ./xdg-desktop-portal-wlr/ -s $@ setup: @rustup install stable diff --git a/README.md b/README.md index d5ebd3b4..dd8c711d 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,8 @@ Multi monitor systems break on `--slurp` usage. This is quite the tricky bug and - scdoc (If present, man-pages will be generated.) - rustup - make +- meson (Required to build XDPW.) +- ninja (Required to build XDPW.) ## Compiling: diff --git a/xdg-desktop-portal-wlr b/xdg-desktop-portal-wlr new file mode 160000 index 00000000..c4b97d80 --- /dev/null +++ b/xdg-desktop-portal-wlr @@ -0,0 +1 @@ +Subproject commit c4b97d800ea585a052e4b519b333f81696ba416f