luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cygwin-macro' into 'master'

Browse Source 
Set G_WITH_CYGWIN again

See merge request GNOME/glib!736
This commit is contained in:
Philip Withnall 2019-03-26 22:55:56 +00:00
commit d264001d79
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -188,10 +188,18 @@ if host_system == 'windows' and get_option('default_library') == 'static'
glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1') glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1')
endif 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' if host_system == 'windows'
glib_os = '''#define G_OS_WIN32 glib_os = '''#define G_OS_WIN32
#define G_PLATFORM_WIN32''' #define G_PLATFORM_WIN32'''
elif host_system == 'cygwin'
glib_os = '''#define G_OS_WIN32
#define G_WITH_CYGWIN'''
else else
glib_os = '#define G_OS_UNIX' glib_os = '#define G_OS_UNIX'
endif endif