From c6b1928facaf0d4688740d8ff2a310ea9361c366 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Thu, 27 Apr 2023 01:44:12 +0300 Subject: [PATCH] Meson: init in all plugins and fix include paths --- borders-plus-plus/borderDeco.cpp | 4 ++-- borders-plus-plus/borderDeco.hpp | 2 +- borders-plus-plus/globals.hpp | 2 +- borders-plus-plus/main.cpp | 6 +++--- borders-plus-plus/meson.build | 25 +++++++++++++++++++++++++ csgo-vulkan-fix/globals.hpp | 2 +- csgo-vulkan-fix/main.cpp | 6 +++--- csgo-vulkan-fix/meson.build | 25 +++++++++++++++++++++++++ hyprbars/meson.build | 27 +++++++++++++++++++++++++++ 9 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 borders-plus-plus/meson.build create mode 100644 csgo-vulkan-fix/meson.build create mode 100644 hyprbars/meson.build diff --git a/borders-plus-plus/borderDeco.cpp b/borders-plus-plus/borderDeco.cpp index 71fa56d..f5f2259 100644 --- a/borders-plus-plus/borderDeco.cpp +++ b/borders-plus-plus/borderDeco.cpp @@ -1,7 +1,7 @@ #include "borderDeco.hpp" -#include -#include +#include +#include #include "globals.hpp" diff --git a/borders-plus-plus/borderDeco.hpp b/borders-plus-plus/borderDeco.hpp index c847386..93ad752 100644 --- a/borders-plus-plus/borderDeco.hpp +++ b/borders-plus-plus/borderDeco.hpp @@ -2,7 +2,7 @@ #define WLR_USE_UNSTABLE -#include +#include class CBordersPlusPlus : public IHyprWindowDecoration { public: diff --git a/borders-plus-plus/globals.hpp b/borders-plus-plus/globals.hpp index 37e8363..2257475 100644 --- a/borders-plus-plus/globals.hpp +++ b/borders-plus-plus/globals.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include inline HANDLE PHANDLE = nullptr; \ No newline at end of file diff --git a/borders-plus-plus/main.cpp b/borders-plus-plus/main.cpp index fa23201..8f8a807 100644 --- a/borders-plus-plus/main.cpp +++ b/borders-plus-plus/main.cpp @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "borderDeco.hpp" #include "globals.hpp" diff --git a/borders-plus-plus/meson.build b/borders-plus-plus/meson.build new file mode 100644 index 0000000..9ae9897 --- /dev/null +++ b/borders-plus-plus/meson.build @@ -0,0 +1,25 @@ +project('borders-plus-plus', 'cpp', + version: '0.1', + default_options: ['buildtype=release'], +) + +cpp_compiler = meson.get_compiler('cpp') +if cpp_compiler.has_argument('-std=c++23') + add_global_arguments('-std=c++23', language: 'cpp') +elif cpp_compiler.has_argument('-std=c++2b') + add_global_arguments('-std=c++2b', language: 'cpp') +else + error('Could not configure current C++ compiler (' + cpp_compiler.get_id() + ' ' + cpp_compiler.version() + ') with required C++ standard (C++23)') +endif + +globber = run_command('find', '.', '-name', '*.cpp', check: true) +src = globber.stdout().strip().split('\n') + +shared_module(meson.project_name(), src, + dependencies: [ + dependency('hyprland'), + dependency('pixman-1'), + dependency('libdrm'), + ], + install: true, +) diff --git a/csgo-vulkan-fix/globals.hpp b/csgo-vulkan-fix/globals.hpp index 37e8363..2257475 100644 --- a/csgo-vulkan-fix/globals.hpp +++ b/csgo-vulkan-fix/globals.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include inline HANDLE PHANDLE = nullptr; \ No newline at end of file diff --git a/csgo-vulkan-fix/main.cpp b/csgo-vulkan-fix/main.cpp index 681da5c..f11c663 100644 --- a/csgo-vulkan-fix/main.cpp +++ b/csgo-vulkan-fix/main.cpp @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include +#include +#include #include "globals.hpp" diff --git a/csgo-vulkan-fix/meson.build b/csgo-vulkan-fix/meson.build new file mode 100644 index 0000000..6914b28 --- /dev/null +++ b/csgo-vulkan-fix/meson.build @@ -0,0 +1,25 @@ +project('csgo-vulkan-fix', 'cpp', + version: '0.1', + default_options: ['buildtype=release'], +) + +cpp_compiler = meson.get_compiler('cpp') +if cpp_compiler.has_argument('-std=c++23') + add_global_arguments('-std=c++23', language: 'cpp') +elif cpp_compiler.has_argument('-std=c++2b') + add_global_arguments('-std=c++2b', language: 'cpp') +else + error('Could not configure current C++ compiler (' + cpp_compiler.get_id() + ' ' + cpp_compiler.version() + ') with required C++ standard (C++23)') +endif + +globber = run_command('find', '.', '-name', '*.cpp', check: true) +src = globber.stdout().strip().split('\n') + +shared_module(meson.project_name(), src, + dependencies: [ + dependency('hyprland'), + dependency('pixman-1'), + dependency('libdrm'), + ], + install: true, +) diff --git a/hyprbars/meson.build b/hyprbars/meson.build new file mode 100644 index 0000000..4d29ac9 --- /dev/null +++ b/hyprbars/meson.build @@ -0,0 +1,27 @@ +project('hyprbars', 'cpp', + version: '0.1', + default_options: ['buildtype=release'], +) + +cpp_compiler = meson.get_compiler('cpp') +if cpp_compiler.has_argument('-std=c++23') + add_global_arguments('-std=c++23', language: 'cpp') +elif cpp_compiler.has_argument('-std=c++2b') + add_global_arguments('-std=c++2b', language: 'cpp') +else + error('Could not configure current C++ compiler (' + cpp_compiler.get_id() + ' ' + cpp_compiler.version() + ') with required C++ standard (C++23)') +endif + +globber = run_command('find', '.', '-name', '*.cpp', check: true) +src = globber.stdout().strip().split('\n') + +hyprland = dependency('hyprland') + +shared_module(meson.project_name(), src, + dependencies: [ + dependency('hyprland'), + dependency('pixman-1'), + dependency('libdrm'), + ], + install: true, +)