Skip to content

Unbreak build on FreeBSD #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vaxerski merged 4 commits into from
May 7, 2023
Merged

Unbreak build on FreeBSD #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47d5dda
make: unhardcode pixman-1 and libdrm include cflags
jbeich May 7, 2023
5c94603
make: drop GCC dependencies
jbeich May 7, 2023
f7ee34d
make: drop GNU make extensions
jbeich May 7, 2023
5d3991c
hyprbars: silence Clang -Wc++11-narrowing like Hyprland
jbeich May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion borders-plus-plus/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all:
g++ -shared -fPIC --no-gnu-unique main.cpp borderDeco.cpp -o borders-plus-plus.so -g -I "/usr/include/pixman-1" -I "/usr/include/libdrm" $(shell pkg-config --cflags hyprland) -std=c++23
$(CXX) -shared -fPIC -Wl,--no-gnu-unique main.cpp borderDeco.cpp -o borders-plus-plus.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b
clean:
rm ./borders-plus-plus.so
2 changes: 1 addition & 1 deletion csgo-vulkan-fix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all:
g++ -shared -fPIC --no-gnu-unique main.cpp -o csgo-vulkan-fix.so -g -I "/usr/include/pixman-1" -I "/usr/include/libdrm" $(shell pkg-config --cflags hyprland) -std=c++23
$(CXX) -shared -fPIC -Wl,--no-gnu-unique main.cpp -o csgo-vulkan-fix.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b
clean:
rm ./csgo-vulkan-fix.so
9 changes: 4 additions & 5 deletions hyprbars/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
CXX = g++
CXXFLAGS = -shared -fPIC --no-gnu-unique -g -std=c++23
INCLUDES = -I "/usr/include/pixman-1" -I "/usr/include/libdrm" $(shell pkg-config --cflags hyprland pangocairo)
LIBS = $(shell pkg-config --libs pangocairo)
CXXFLAGS = -shared -fPIC -Wl,--no-gnu-unique -g -std=c++2b -Wno-c++11-narrowing
INCLUDES = `pkg-config --cflags pixman-1 libdrm hyprland pangocairo`
LIBS = `pkg-config --libs pangocairo`

SRC = main.cpp barDeco.cpp
TARGET = hyprbars.so

all: $(TARGET)

$(TARGET): $(SRC)
$(CXX) $(CXXFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
$(CXX) $(CXXFLAGS) $(INCLUDES) $^ $> -o $@ $(LIBS)

clean:
rm ./$(TARGET)
Expand Down
6 changes: 6 additions & 0 deletions hyprbars/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ else
error('Could not configure current C++ compiler (' + cpp_compiler.get_id() + ' ' + cpp_compiler.version() + ') with required C++ standard (C++23)')
endif

add_project_arguments(
[
'-Wno-narrowing',
],
language: 'cpp')

globber = run_command('find', '.', '-name', '*.cpp', check: true)
src = globber.stdout().strip().split('\n')

Expand Down