luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-gio-module-path-msvc' into 'master'

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

See merge request GNOME/glib!1254
This commit is contained in:
Christoph Reiter 2019-12-12 18:29:07 +00:00
commit a8263add45
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

@ -1153,18 +1153,9 @@ get_gio_module_dir (void)
gchar *install_dir;
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,
"lib", "gio", "modules",
NULL);
#endif
g_free (install_dir);
#else
module_dir = g_strdup (GIO_MODULE_DIR);