diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-21 04:07:24 +0530 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2017-07-13 19:03:39 -0400 |
commit | fe2a9887a8ccb14f2386e01b14834e97a33bc2d7 (patch) | |
tree | 810c2025818a380c51af2686d2337ab19672c2fc /gio/xdgmime | |
parent | 213957970ee4e58e37ee2c81766284af34dddcb9 (diff) | |
download | glib-fe2a9887a8ccb14f2386e01b14834e97a33bc2d7.tar.gz |
meson: Improve MSVC and MinGW support and fix dependencies everywhere
Disable gio tests on Windows, fix .gitignore to not ignore
config.h.meson, and add more things to it.
Rename the library file naming and versioning to match what Autotools
outputs, e.g., libglib-2.0.so.0.5000.2 on Linux, libglib-2.0-0.dll and
glib-2.0-0.dll on Windows with MSVC.
Several more tiny fixes, more executables built and installed, install
pkg-config and m4 files, fix building of gobject tests.
Changes to gdbus-codegen to support out-of-tree builds without
environment variables set (which you can't in Meson). We now add the
build directory to the Python module search path.
Diffstat (limited to 'gio/xdgmime')
-rw-r--r-- | gio/xdgmime/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gio/xdgmime/meson.build b/gio/xdgmime/meson.build index 4b042215c..5e1fb4a63 100644 --- a/gio/xdgmime/meson.build +++ b/gio/xdgmime/meson.build @@ -11,5 +11,5 @@ xdgmime_sources = [ xdgmime_lib = static_library('xdgmime', sources : xdgmime_sources, - include_directories : inc_dirs, + include_directories : [configinc], c_args : [ '-DHAVE_CONFIG_H', '-DXDG_PREFIX=_gio_xdg', '-fPIC' ]) |