Commit ffe5cdab authored by Sebastian Dröge's avatar Sebastian Dröge

Merge branch 'fix-gio-modules-msvc' into 'master'

gio: Also support modules built with MSVC

See merge request !686
parents 9aab3064 2d6c4b28
Pipeline #61123 passed with stages
in 11 minutes and 52 seconds
......@@ -51,7 +51,8 @@ _g_io_module_extract_name (const char *filename)
if (g_str_has_prefix (bname, "libgio"))
prefix_len = 6;
else if (g_str_has_prefix (bname, "lib"))
/* DLLs built with MSVC generally do not have the 'lib' prefix */
else if (g_str_has_prefix (bname, "lib") || g_str_has_prefix (bname, "gio"))
prefix_len = 3;
else
prefix_len = 0; /* use whole name (minus suffix) as plugin name */
......
......@@ -754,7 +754,7 @@ gioenumtypes_c = custom_target('gioenumtypes_c',
'--template', files('gioenumtypes.c.template'),
'@INPUT@', gnetworking_h])
gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h])
gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, gobjectenumtypes_h])
# inotify
if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1
......
......@@ -8,8 +8,8 @@ giowin32_sources = [
]
giowin32_lib = static_library('giowin32',
sources : [giowin32_sources, gioenumtypes_h],
sources : [giowin32_sources],
include_directories : [configinc, glibinc, gioinc, gmoduleinc],
dependencies : [libintl],
dependencies : [libintl, gioenumtypes_dep],
pic : true,
c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment