[gtk/gtk-3-24-meson] meson: Fix building with builtin immodules
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24-meson] meson: Fix building with builtin immodules
- Date: Wed, 10 Apr 2019 09:48:04 +0000 (UTC)
commit beec464000b699856333912afc811ec2f1df9d7f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Apr 10 17:20:18 2019 +0800
meson: Fix building with builtin immodules
We also need to ensure that we pass in -DINCLUDE_IM_xxxx when building
the GTK DLL/.so, in addition to building the respective (static)
immodules, so that we did really link in the immodules into the final
GTK DLL/.so.
gtk/meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index e1b1a268ec..01c999ebfb 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -952,10 +952,11 @@ foreach l: immodules
cflags = l.get(3, [])
if cond and builtin_immodules
+ gtk_cargs += ['-DINCLUDE_IM_@0@'.format(name)]
mod = static_library('staticimmodule-@0@'.format(name),
sources + gtk_dep_sources,
dependencies: gtk_deps + [libgdk_dep] ,
- c_args: gtk_cargs + common_cflags + ['-DINCLUDE_IM_@0@'.format(name)] + cflags,
+ c_args: gtk_cargs + common_cflags + cflags,
include_directories: [confinc, gdkinc, gtkinc])
gtk_included_im_deps += declare_dependency(link_with: mod)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]