From dbf0b92de78377328e4895871923724883f74355 Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Mon, 1 May 2023 01:04:25 +0100 Subject: [PATCH] Plugin header overhaul 2: fixes (Electric boogaloo) (#2201) * Add wlroots headers to makefile + fix pluginenv with new headers * Add wlroots to pc --- Makefile | 15 ++++++++++++++- hyprland.pc.in | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 90e12619..87a6850e 100644 --- a/Makefile +++ b/Makefile @@ -49,11 +49,14 @@ install: cp ./assets/wall_8K.png ${PREFIX}/share/hyprland install -Dm644 -t ${PREFIX}/share/man/man1 ./docs/*.1 - mkdir -p ${PREFIX}/include/hyprland + mkdir -p ${PREFIX}/include/hyprland mkdir -p ${PREFIX}/include/hyprland/protocols + mkdir -p ${PREFIX}/include/hyprland/wlroots mkdir -p ${PREFIX}/share/pkgconfig + find src -name '*.h*' -exec cp --parents '{}' ${PREFIX}/include/hyprland ';' + cd subprojects/wlroots/include && find . -name '*.h*' -exec cp --parents '{}' ${PREFIX}/include/hyprland/wlroots ';' && cd ../../.. cp ./protocols/*-protocol.h ${PREFIX}/include/hyprland/protocols cp ./build/hyprland.pc ${PREFIX}/share/pkgconfig @@ -95,6 +98,16 @@ pluginenv: cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build -G Ninja + mkdir -p ${PREFIX}/include/hyprland + mkdir -p ${PREFIX}/include/hyprland/protocols + mkdir -p ${PREFIX}/include/hyprland/wlroots + mkdir -p ${PREFIX}/share/pkgconfig + + find src -name '*.h*' -exec cp --parents '{}' ${PREFIX}/include/hyprland ';' + cd subprojects/wlroots/include && find . -name '*.h*' -exec cp --parents '{}' ${PREFIX}/include/hyprland/wlroots ';' && cd ../../.. + cp ./protocols/*-protocol.h ${PREFIX}/include/hyprland/protocols + cp ./build/hyprland.pc ${PREFIX}/share/pkgconfig + configdebug: make fixwlr diff --git a/hyprland.pc.in b/hyprland.pc.in index 76dcc677..6d158b72 100644 --- a/hyprland.pc.in +++ b/hyprland.pc.in @@ -5,4 +5,4 @@ Name: Hyprland URL: https://github.com/hyprwm/Hyprland Description: Hyprland header files Version: @HYPRLAND_VERSION@ -Cflags: -I"${includedir}" -I"${includedir}/hyprland/protocols" +Cflags: -I"${includedir}" -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots"