callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Fix building with builtin immodules

Browse Source 
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.
This commit is contained in:
Chun-wei Fan 2019-04-10 17:20:18 +08:00 committed by Christoph Reiter
parent b6b15508d5
commit 651715b8e8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/meson.build
View File

@ -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)