X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_env_msvc.cc;h=7189892f5f106fb8ceab3099dbd8ee895cacf7dd;hb=5e7d9d30e28e8022661497244ccd43a1f5a836c6;hp=afba402296b099f5edd007a93eede2d9b93beb22;hpb=bf2625de40108740ce08c9ecce46c352aadc292a;p=ardour.git

diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc
index afba402296..7189892f5f 100644
--- a/gtk2_ardour/bundle_env_msvc.cc
+++ b/gtk2_ardour/bundle_env_msvc.cc
@@ -341,7 +341,7 @@ string clearlooks_la_file;
 }
 
 void
-fixup_bundle_environment (int argc, char* argv[], const char** localedir)
+fixup_bundle_environment (int argc, char* argv[], string & localedir)
 {
 	std::string exec_path = argv[0];
 	std::string dir_path  = Glib::path_get_dirname (exec_path);
@@ -411,6 +411,10 @@ fixup_bundle_environment (int argc, char* argv[], const char** localedir)
 	Glib::setenv ("LADSPA_PATH", path, true);
 
 
+	// Next, set up 'SUIL_MODULE_DIR'
+	Glib::setenv ("SUIL_MODULE_DIR", Glib::build_filename(ardour_dll_directory(), "suil"), true);
+
+
 	// Next, set up 'VAMP_PATH'
 	cstr = getenv ("VAMP_PATH");
 	if (cstr) {
@@ -446,7 +450,7 @@ fixup_bundle_environment (int argc, char* argv[], const char** localedir)
 		Glib::setenv ("GTK_LOCALEDIR", path, true);
 
 		// and return the same path to our caller
-		(*localedir) = strdup (path.c_str());
+		localedir = path;
 	}
 
 
@@ -476,8 +480,10 @@ fixup_bundle_environment (int argc, char* argv[], const char** localedir)
 
 	fixup_fonts_config();
 	fixup_clearlooks_config();
-	fixup_pixbuf_loaders_config();
 
+#ifdef DLL_PIXBUF_LOADERS
+	fixup_pixbuf_loaders_config();
+#endif
 #ifdef DLL_PANGO_MODULES
 	fixup_pango_config();
 #endif