build: use add_project_arguments instead of configuration_data

No need to include config.h anymore.
swaywm · Jul 19, 2021 · 33bfdf9 · 33bfdf9
1 parent 7df581d
commit 33bfdf9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git 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 <stdint.h>
 #include <cairo.h>
 #include <wayland-client.h>

diff --git a/include/meson.build b/include/meson.build
diff --git 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,