diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2021-03-26 18:47:03 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-03-26 18:47:03 +0000 |
| commit | f3e8a95849884aaf86e3313e97db332a31e94cb0 (patch) | |
| tree | c40f79b17f689ef925b26c10b697d5f601673347 /meson.build | |
| parent | 19512e34675b658e7509957b4f99bff2c3d56979 (diff) | |
| parent | dbd117b9272524d8f0ae42b2555872a160e5d291 (diff) | |
| download | gdk-pixbuf-f3e8a95849884aaf86e3313e97db332a31e94cb0.tar.gz | |
Merge branch 'fix_android' into 'master'
Fix build for Android
See merge request GNOME/gdk-pixbuf!104
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 66f9d351e..7880577dc 100644 --- a/meson.build +++ b/meson.build @@ -190,10 +190,10 @@ if host_machine.system() == 'darwin' gdk_pixbuf_conf.set('OS_DARWIN', 1) endif -# On non-Windows/macOS systems we always required shared-mime-info and GIO +# On non-Windows/macOS/android systems we always required shared-mime-info and GIO # shared_mime_dep = [] shared_mime_dep = [] -if get_option('gio_sniffing') and host_system != 'windows' and host_system != 'darwin' +if get_option('gio_sniffing') and host_system != 'windows' and host_system != 'darwin' and host_system != 'android' shared_mime_dep += dependency('shared-mime-info') gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) endif |