From 9971fec974a9d94a2a1b1d68d5ada5fc59fec053 Mon Sep 17 00:00:00 2001 From: zebogan <121365051+zebogan@users.noreply.github.com> Date: Sat, 20 Apr 2024 03:05:44 -0700 Subject: [PATCH] treewide: update pkgconfig flags to include irregular locations of headers on distros like openSUSE (#150) --- borders-plus-plus/Makefile | 2 +- borders-plus-plus/meson.build | 5 +++++ csgo-vulkan-fix/Makefile | 2 +- csgo-vulkan-fix/meson.build | 5 +++++ hyprbars/Makefile | 2 +- hyprbars/meson.build | 1 + hyprexpo/Makefile | 2 +- hyprexpo/meson.build | 4 ++++ hyprtrails/Makefile | 2 +- hyprtrails/meson.build | 5 +++++ hyprwinwrap/Makefile | 2 +- hyprwinwrap/meson.build | 5 +++++ 12 files changed, 31 insertions(+), 6 deletions(-) diff --git a/borders-plus-plus/Makefile b/borders-plus-plus/Makefile index 559aafa..a1d6152 100644 --- a/borders-plus-plus/Makefile +++ b/borders-plus-plus/Makefile @@ -1,4 +1,4 @@ all: - $(CXX) -shared -fPIC --no-gnu-unique main.cpp borderDeco.cpp -o borders-plus-plus.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b -O2 + $(CXX) -shared -fPIC --no-gnu-unique main.cpp borderDeco.cpp -o borders-plus-plus.so -g `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` -std=c++2b -O2 clean: rm ./borders-plus-plus.so diff --git a/borders-plus-plus/meson.build b/borders-plus-plus/meson.build index 9ae9897..df0872f 100644 --- a/borders-plus-plus/meson.build +++ b/borders-plus-plus/meson.build @@ -20,6 +20,11 @@ shared_module(meson.project_name(), src, dependency('hyprland'), dependency('pixman-1'), dependency('libdrm'), + dependency('pangocairo'), + dependency('libinput'), + dependency('libudev'), + dependency('wayland-server'), + dependency('xkbcommon'), ], install: true, ) diff --git a/csgo-vulkan-fix/Makefile b/csgo-vulkan-fix/Makefile index 4a067b2..f9bb88d 100644 --- a/csgo-vulkan-fix/Makefile +++ b/csgo-vulkan-fix/Makefile @@ -1,4 +1,4 @@ all: - $(CXX) -shared -fPIC --no-gnu-unique main.cpp -o csgo-vulkan-fix.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b -O2 + $(CXX) -shared -fPIC --no-gnu-unique main.cpp -o csgo-vulkan-fix.so -g `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` -std=c++2b -O2 clean: rm ./csgo-vulkan-fix.so diff --git a/csgo-vulkan-fix/meson.build b/csgo-vulkan-fix/meson.build index 6914b28..671f2d8 100644 --- a/csgo-vulkan-fix/meson.build +++ b/csgo-vulkan-fix/meson.build @@ -20,6 +20,11 @@ shared_module(meson.project_name(), src, dependency('hyprland'), dependency('pixman-1'), dependency('libdrm'), + dependency('pangocairo'), + dependency('libinput'), + dependency('libudev'), + dependency('wayland-server'), + dependency('xkbcommon'), ], install: true, ) diff --git a/hyprbars/Makefile b/hyprbars/Makefile index c0eaacb..26d3414 100644 --- a/hyprbars/Makefile +++ b/hyprbars/Makefile @@ -1,5 +1,5 @@ CXXFLAGS = -shared -fPIC --no-gnu-unique -g -std=c++2b -Wno-c++11-narrowing -INCLUDES = `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server hyprland` +INCLUDES = `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` LIBS = `pkg-config --libs pangocairo` SRC = main.cpp barDeco.cpp diff --git a/hyprbars/meson.build b/hyprbars/meson.build index 08b76ac..6a6238f 100644 --- a/hyprbars/meson.build +++ b/hyprbars/meson.build @@ -32,6 +32,7 @@ shared_module(meson.project_name(), src, dependency('libinput'), dependency('libudev'), dependency('wayland-server'), + dependency('xkbcommon'), ], install: true, ) diff --git a/hyprexpo/Makefile b/hyprexpo/Makefile index deadaf3..b75cf94 100644 --- a/hyprexpo/Makefile +++ b/hyprexpo/Makefile @@ -1,4 +1,4 @@ all: - $(CXX) -shared -fPIC --no-gnu-unique main.cpp overview.cpp -o hyprexpo.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b -Wno-narrowing + $(CXX) -shared -fPIC --no-gnu-unique main.cpp overview.cpp -o hyprexpo.so -g `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` -std=c++2b -Wno-narrowing clean: rm ./hyprexpo.so diff --git a/hyprexpo/meson.build b/hyprexpo/meson.build index 460c634..6a68ab0 100644 --- a/hyprexpo/meson.build +++ b/hyprexpo/meson.build @@ -29,6 +29,10 @@ shared_module(meson.project_name(), src, dependency('pixman-1'), dependency('libdrm'), dependency('pangocairo'), + dependency('libinput'), + dependency('libudev'), + dependency('wayland-server'), + dependency('xkbcommon'), ], install: true, ) diff --git a/hyprtrails/Makefile b/hyprtrails/Makefile index 9415eb7..8507b02 100644 --- a/hyprtrails/Makefile +++ b/hyprtrails/Makefile @@ -1,4 +1,4 @@ all: - $(CXX) -shared -fPIC --no-gnu-unique main.cpp trail.cpp -o hyprtrails.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b -O2 + $(CXX) -shared -fPIC --no-gnu-unique main.cpp trail.cpp -o hyprtrails.so -g `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` -std=c++2b -O2 clean: rm ./hyprtrails.so diff --git a/hyprtrails/meson.build b/hyprtrails/meson.build index 2a4993f..47dbcb3 100644 --- a/hyprtrails/meson.build +++ b/hyprtrails/meson.build @@ -28,6 +28,11 @@ shared_module(meson.project_name(), src, dependency('hyprland'), dependency('pixman-1'), dependency('libdrm'), + dependency('pangocairo'), + dependency('libinput'), + dependency('libudev'), + dependency('wayland-server'), + dependency('xkbcommon'), ], install: true, ) diff --git a/hyprwinwrap/Makefile b/hyprwinwrap/Makefile index 20275ee..83864da 100644 --- a/hyprwinwrap/Makefile +++ b/hyprwinwrap/Makefile @@ -1,4 +1,4 @@ all: - $(CXX) -shared -fPIC --no-gnu-unique main.cpp -o hyprwinwrap.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b -O2 + $(CXX) -shared -fPIC --no-gnu-unique main.cpp -o hyprwinwrap.so -g `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` -std=c++2b -O2 clean: rm ./hyprwinwrap.so diff --git a/hyprwinwrap/meson.build b/hyprwinwrap/meson.build index ea16ec4..6e2010d 100644 --- a/hyprwinwrap/meson.build +++ b/hyprwinwrap/meson.build @@ -20,6 +20,11 @@ shared_module(meson.project_name(), src, dependency('hyprland'), dependency('pixman-1'), dependency('libdrm'), + dependency('pangocairo'), + dependency('libinput'), + dependency('libudev'), + dependency('wayland-server'), + dependency('xkbcommon'), ], install: true, )