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

giomodule: gio modules are no longer installed in bindir on MSVC

Browse Source 
Ever since the port to Meson, gio modules (f.ex., by glib-networking)
are installed inside libdir both for MinGW and MSVC.
This commit is contained in:
Nirbheek Chauhan 2019-11-26 23:45:19 +05:30
parent 902fc6d261
commit 5f0d0efeb6
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gio/giomodule.c
View File

@ -1144,18 +1144,9 @@ get_gio_module_dir (void)
gchar *install_dir; gchar *install_dir;
install_dir = g_win32_get_package_installation_directory_of_module (gio_dll); install_dir = g_win32_get_package_installation_directory_of_module (gio_dll);
#ifdef _MSC_VER
/* On Visual Studio builds we have all the libraries and binaries in bin
* so better load the gio modules from bin instead of lib
*/
module_dir = g_build_filename (install_dir,
"bin", "gio", "modules",
NULL);
#else
module_dir = g_build_filename (install_dir, module_dir = g_build_filename (install_dir,
"lib", "gio", "modules", "lib", "gio", "modules",
NULL); NULL);
#endif
g_free (install_dir); g_free (install_dir);
#else #else
module_dir = g_strdup (GIO_MODULE_DIR); module_dir = g_strdup (GIO_MODULE_DIR);