From 33bfdf9adb269ec5912420803812f660b724adf5 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 19 Jul 2021 13:16:38 +0200 Subject: build: use add_project_arguments instead of configuration_data No need to include config.h anymore. --- include/cairo_util.h | 1 - include/meson.build | 1 - meson.build | 11 +++++------ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 include/meson.build diff --git a/include/cairo_util.h b/include/cairo_util.h index a64c355..fd611b6 100644 --- a/include/cairo_util.h +++ b/include/cairo_util.h @@ -1,7 +1,6 @@ #ifndef _SWAY_CAIRO_UTIL_H #define _SWAY_CAIRO_UTIL_H -#include "config.h" #include #include #include diff --git a/include/meson.build b/include/meson.build deleted file mode 100644 index 65ed027..0000000 --- a/include/meson.build +++ /dev/null @@ -1 +0,0 @@ -configure_file(output: 'config.h', configuration: conf_data) diff --git a/meson.build b/meson.build index a06afeb..19c74f9 100644 --- a/meson.build +++ b/meson.build @@ -43,7 +43,11 @@ if git.found() version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip()) endif endif -add_project_arguments('-DSWAYBG_VERSION=@0@'.format(version), language: 'c') + +add_project_arguments([ + '-DSWAYBG_VERSION=@0@'.format(version), + '-DHAVE_GDK_PIXBUF=@0@'.format(gdk_pixbuf.found().to_int()), +], language: 'c') wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir') @@ -91,11 +95,6 @@ client_protos = declare_dependency( sources: client_protos_headers, ) -conf_data = configuration_data() -conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) - -subdir('include') - dependencies = [ cairo, client_protos, -- cgit v1.2.3