diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2019-03-26 22:55:56 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2019-03-26 22:55:56 +0000 |
| commit | d264001d79d0b0f2b963973e4833cbb96941e930 (patch) | |
| tree | ccf06816a06f99f7b98f76f29b6a1b5c4ae42560 | |
| parent | ad19bb8f12f5604e8e4414514ba538ca7ae2ddf2 (diff) | |
| parent | 9ca7ac782e9f8cc8d4648d45afd39d0ab7ef7289 (diff) | |
| download | glib-d264001d79d0b0f2b963973e4833cbb96941e930.tar.gz | |
Merge branch 'cygwin-macro' into 'master'
Set G_WITH_CYGWIN again
See merge request GNOME/glib!736
| -rw-r--r-- | meson.build | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meson.build b/meson.build index d937b5fa3..9622ced5c 100644 --- a/meson.build +++ b/meson.build @@ -188,10 +188,18 @@ if host_system == 'windows' and get_option('default_library') == 'static' glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1') endif -# FIXME: what about Cygwin (G_WITH_CYGWIN) +# Cygwin glib port maintainers made it clear +# (via the patches they apply) that they want no +# part of glib W32 code, therefore we do not define +# G_PLATFORM_WIN32 for host_system == 'cygwin'. +# This makes G_PLATFORM_WIN32 a synonym for +# G_OS_WIN32. if host_system == 'windows' glib_os = '''#define G_OS_WIN32 #define G_PLATFORM_WIN32''' +elif host_system == 'cygwin' + glib_os = '''#define G_OS_WIN32 +#define G_WITH_CYGWIN''' else glib_os = '#define G_OS_UNIX' endif |