summaryrefslogtreecommitdiff
path: root/gio/giomodule.c
diff options
context:
space:
mode:
authorIgnacio Casal Quinteiro <icq@gnome.org>2015-10-22 08:19:19 +0200
committerIgnacio Casal Quinteiro <icq@gnome.org>2015-10-22 09:22:01 +0200
commit144a87a643a619ff82a3acaffa6ac3761bc5db1f (patch)
treeef5f36e8c88c53ce2624d1905f48f8be2bac350c /gio/giomodule.c
parent6dedc0364afeafac3bbae7ecbb87249234a4ca85 (diff)
downloadglib-144a87a643a619ff82a3acaffa6ac3761bc5db1f.tar.gz
Use bin/gio/modules when building with visual studio
Diffstat (limited to 'gio/giomodule.c')
-rw-r--r--gio/giomodule.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 67ccb3b48..eb5cb5537 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -1022,9 +1022,18 @@ 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 = GIO_MODULE_DIR;