blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #924 from alebastr/build-fixes 

Build fixes
This commit is contained in:
Alex 2020-11-27 09:01:50 +01:00 committed by GitHub
parent 05b12602d4 2695985da0
commit 14a6cec6d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -2,6 +2,7 @@ project(
'waybar', 'cpp', 'c', 'waybar', 'cpp', 'c',
version: '0.9.4', version: '0.9.4',
license: 'MIT', license: 'MIT',
meson_version: '>= 0.49.0',
default_options : [ default_options : [
'cpp_std=c++17', 'cpp_std=c++17',
'buildtype=release', 'buildtype=release',
@ -9,8 +10,6 @@ project(
], ],
) )
fs = import('fs')
compiler = meson.get_compiler('cpp') compiler = meson.get_compiler('cpp')
cpp_args = [] cpp_args = []
@ -318,9 +317,9 @@ if scdoc.found()
foreach file : man_files foreach file : man_files
path = '@0@'.format(file) path = '@0@'.format(file)
basename = fs.name(path) basename = path.split('/')[-1]
topic = basename.split('.')[-3].split('/')[-1] topic = basename.split('.')[-3]
section = basename.split('.')[-2] section = basename.split('.')[-2]
output = '@0@.@1@'.format(topic, section) output = '@0@.@1@'.format(topic, section)

1
src/modules/network.cpp
View File

@ -3,6 +3,7 @@
#include <sys/eventfd.h> #include <sys/eventfd.h>
#include <fstream> #include <fstream>
#include <cassert> #include <cassert>
#include <optional>
#include "util/format.hpp" #include "util/format.hpp"
#ifdef WANT_RFKILL #ifdef WANT_RFKILL
#include "util/rfkill.hpp" #include "util/rfkill.hpp"