Plugin header overhaul 2: fixes (Electric boogaloo) (#2201)

* Add wlroots headers to makefile + fix pluginenv with new headers

* Add wlroots to pc
This commit is contained in:
Vaxry 2023-05-01 01:04:25 +01:00 committed by GitHub
parent 02312cac59
commit dbf0b92de7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions

View file

@ -49,11 +49,14 @@ install:
cp ./assets/wall_8K.png ${PREFIX}/share/hyprland cp ./assets/wall_8K.png ${PREFIX}/share/hyprland
install -Dm644 -t ${PREFIX}/share/man/man1 ./docs/*.1 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/protocols
mkdir -p ${PREFIX}/include/hyprland/wlroots
mkdir -p ${PREFIX}/share/pkgconfig mkdir -p ${PREFIX}/share/pkgconfig
find src -name '*.h*' -exec cp --parents '{}' ${PREFIX}/include/hyprland ';' 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 ./protocols/*-protocol.h ${PREFIX}/include/hyprland/protocols
cp ./build/hyprland.pc ${PREFIX}/share/pkgconfig 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 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: configdebug:
make fixwlr make fixwlr

View file

@ -5,4 +5,4 @@ Name: Hyprland
URL: https://github.com/hyprwm/Hyprland URL: https://github.com/hyprwm/Hyprland
Description: Hyprland header files Description: Hyprland header files
Version: @HYPRLAND_VERSION@ Version: @HYPRLAND_VERSION@
Cflags: -I"${includedir}" -I"${includedir}/hyprland/protocols" Cflags: -I"${includedir}" -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots"