[gdk-pixbuf] build: Fix Meson builds using builtin loaders
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] build: Fix Meson builds using builtin loaders
- Date: Thu, 17 Aug 2017 07:17:55 +0000 (UTC)
commit 6ce0b0bca07ffc709f46abb7bec1b88a5fe5df4a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Aug 3 17:27:08 2017 +0800
build: Fix Meson builds using builtin loaders
We need to ensure that the loaders that are to be built into the main
GDK-Pixbuf library is built as follows:
-The individual loader sources are built with the corresponding
INCLUDE_xxx macro defined.
-The GDK-Pixbuf library itself must be built with all of the INCLUDE_xxx
macros defined for building the individual loaders that we are building
into the main GDK-Pixbuf library
There is also a typo for the macro to make the loaders built into the
GDK-Pixbuf library, so correct that as well (-DINCLUDED_xxx ->
-DINCLUDE_xxx).
https://bugzilla.gnome.org/show_bug.cgi?id=785767
gdk-pixbuf/meson.build | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index bc4ef4f..f15ad2b 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -99,13 +99,14 @@ foreach l: loaders
cond = l.get(2, true)
if cond and builtin_loaders.contains(name)
- included_loaders_cflags += '-DINCLUDED_@0@'.format(name)
+ cflag_for_included_loader = ['-DINCLUDE_@0@'.format(name)]
+ included_loaders_cflags += cflag_for_included_loader
mod = static_library('staticpixbufloader-@0@'.format(name),
sources,
dependencies: loaders_deps + gdk_pixbuf_deps,
include_directories: [ root_inc, gdk_pixbuf_inc ],
- c_args: common_cflags + gdk_pixbuf_cflags)
+ c_args: common_cflags + gdk_pixbuf_cflags + cflag_for_included_loader)
included_loaders_deps += declare_dependency(link_with: mod)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]