luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 12:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert-3509' into 'main'

Browse Source 
Revert "build-sys: drop -mms-bitfields GCC flag"

See merge request GNOME/glib!3514
This commit is contained in:
Emmanuele Bassi 2023-07-30 10:50:05 +00:00
commit 95f372086a
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/win32-build.md
View File

@ -65,10 +65,10 @@ Building software that just *uses* GLib or GTK also require to have
the right compiler set up the right way. If you intend to use MinGW-GCC, the right compiler set up the right way. If you intend to use MinGW-GCC,
follow the relevant instructions below in that case, too. follow the relevant instructions below in that case, too.
You should link to GLib using the `-mms-bitfields` GCC flag. It is the default You should link to GLib using the `-mms-bitfields` GCC flag. This flag means
since 2012 (GCC 4.7). This flag means that the struct layout rules are identical that the struct layout rules are identical to those used by MSVC. This is
to those used by MSVC. This is essential if the same DLLs are to be usable both essential if the same DLLs are to be usable both from gcc- and MSVC-compiled
from gcc- and MSVC-compiled code. code.
## Cross-CRT issues ## Cross-CRT issues

2
glib/meson.build
View File

@ -443,7 +443,7 @@ pkg.generate(libglib,
libraries : [libintl_deps], libraries : [libintl_deps],
libraries_private : [win32_ldflags], libraries_private : [win32_ldflags],
subdirs : ['glib-2.0'], subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : [ variables : [
'bindir=' + '${prefix}' / get_option('bindir'), 'bindir=' + '${prefix}' / get_option('bindir'),
'datadir=' + '${prefix}' / get_option('datadir'), 'datadir=' + '${prefix}' / get_option('datadir'),

8
meson.build
View File

@ -50,6 +50,7 @@ if cc.get_id() == 'msvc'
noseh_link_args = ['/SAFESEH:NO'] noseh_link_args = ['/SAFESEH:NO']
else else
noseh_link_args = [] noseh_link_args = []
# -mms-bitfields vs -fnative-struct ?
endif endif
host_system = host_machine.system() host_system = host_machine.system()
@ -2351,8 +2352,15 @@ else
export_dynamic_ldflags = ['-Wl,--export-dynamic'] export_dynamic_ldflags = ['-Wl,--export-dynamic']
endif endif
win32_cflags = []
win32_ldflags = [] win32_ldflags = []
if host_system == 'windows' and cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' if host_system == 'windows' and cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
# Ensure MSVC-compatible struct packing convention is used when
# compiling for Win32 with gcc. It is used for the whole project and exposed
# in glib-2.0.pc.
win32_cflags = ['-mms-bitfields']
add_project_arguments(win32_cflags, language : 'c')
# Win32 API libs, used only by libglib and exposed in glib-2.0.pc # Win32 API libs, used only by libglib and exposed in glib-2.0.pc
win32_ldflags = ['-lws2_32', '-lole32', '-lwinmm', '-lshlwapi', '-luuid'] win32_ldflags = ['-lws2_32', '-lole32', '-lwinmm', '-lshlwapi', '-luuid']
elif host_system == 'cygwin' elif host_system == 'cygwin'