minor tweaks to Cut Time dialog. Use an enum to tell preferred_edit_location what...

[ardour.git] / gtk2_ardour / bundle_env_msvc.cc

diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc
index 5e2da98bd4467ce7d8fbe108f8926c63f4af3eb9..7189892f5f106fb8ceab3099dbd8ee895cacf7dd 100644 (file)
--- 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;
        }
 
 
@@ -475,9 +479,14 @@ fixup_bundle_environment (int argc, char* argv[], const char** localedir)
        }
 
        fixup_fonts_config();
-       fixup_pango_config();
        fixup_clearlooks_config();
+
+#ifdef DLL_PIXBUF_LOADERS
        fixup_pixbuf_loaders_config();
+#endif
+#ifdef DLL_PANGO_MODULES
+       fixup_pango_config();
+#endif
 }