Use bin/gio/modules when building with visual studio

This commit is contained in:
Ignacio Casal Quinteiro 2015-10-22 08:19:19 +02:00
parent 6dedc0364a
commit 144a87a643

View File

@ -1022,9 +1022,18 @@ 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 = GIO_MODULE_DIR; module_dir = GIO_MODULE_DIR;