diff --git a/borders-plus-plus/Makefile b/borders-plus-plus/Makefile index fe890ca..3baa44a 100644 --- a/borders-plus-plus/Makefile +++ b/borders-plus-plus/Makefile @@ -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 diff --git a/csgo-vulkan-fix/Makefile b/csgo-vulkan-fix/Makefile index f90327c..2242516 100644 --- a/csgo-vulkan-fix/Makefile +++ b/csgo-vulkan-fix/Makefile @@ -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 diff --git a/hyprbars/Makefile b/hyprbars/Makefile index f157c65..2709b85 100644 --- a/hyprbars/Makefile +++ b/hyprbars/Makefile @@ -1,7 +1,6 @@ -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 @@ -9,7 +8,7 @@ TARGET = hyprbars.so all: $(TARGET) $(TARGET): $(SRC) - $(CXX) $(CXXFLAGS) $(INCLUDES) $^ -o $@ $(LIBS) + $(CXX) $(CXXFLAGS) $(INCLUDES) $^ $> -o $@ $(LIBS) clean: rm ./$(TARGET) diff --git a/hyprbars/meson.build b/hyprbars/meson.build index 7a06ff4..e6c4981 100644 --- a/hyprbars/meson.build +++ b/hyprbars/meson.build @@ -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')