X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_env_msvc.cc;h=864f9d82882cc6d1c77bfbd966598e5d073b14ac;hb=6a52dc321954b3d65ee9840bef08fe3c047d8850;hp=5e2da98bd4467ce7d8fbe108f8926c63f4af3eb9;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git

diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc
index 5e2da98bd4..864f9d8288 100644
--- a/gtk2_ardour/bundle_env_msvc.cc
+++ b/gtk2_ardour/bundle_env_msvc.cc
@@ -29,7 +29,7 @@
 #include <fstream>
 
 #include <glibmm.h>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include <fontconfig/fontconfig.h>
 
@@ -86,7 +86,7 @@ std::string ret;
 	if (0 == pExeRoot) {
 		pExeRoot = g_build_filename("C:\\", "Program Files", PROGRAM_NAME, 0);
 	}
-	
+
 	if (pExeRoot) {
 		gchar  tmp[PATH_MAX+1];
 		gchar* p;
@@ -232,7 +232,7 @@ string fonts_conf_file;
 
 #ifdef DEBUG
 	fonts_conf_file = get_module_folder();
-	
+
 	if (!fonts_conf_file.empty()) {
 		fonts_conf_file += "\\";
 		fonts_conf_file += PROGRAM_NAME;
@@ -257,7 +257,7 @@ string pango_modules_file;
 #if defined(DEBUG) || defined(RDC_BUILD)
 	// Make sure we pick up the debuggable DLLs !!!
 	pango_modules_file = get_module_folder();
-	
+
 	if (!pango_modules_file.empty()) {
 		pango_modules_file += "\\";
 		pango_modules_file += PROGRAM_NAME;
@@ -295,7 +295,7 @@ string gdk_pixbuf_loaders_file;
 #if defined(DEBUG) || defined(RDC_BUILD)
 	// Make sure we pick up the debuggable DLLs !!!
 	gdk_pixbuf_loaders_file = get_module_folder();
-	
+
 	if (!gdk_pixbuf_loaders_file.empty()) {
 		gdk_pixbuf_loaders_file += "\\";
 		gdk_pixbuf_loaders_file += PROGRAM_NAME;
@@ -321,7 +321,7 @@ string clearlooks_la_file;
 #if defined(DEBUG) || defined(RDC_BUILD)
 	// Make sure we pick up the debuggable DLLs !!!
 	clearlooks_la_file = get_module_folder();
-	
+
 	if (!clearlooks_la_file.empty()) {
 		clearlooks_la_file += "\\";
 		clearlooks_la_file += PROGRAM_NAME;
@@ -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;
 	}
 
 
@@ -463,8 +467,8 @@ fixup_bundle_environment (int argc, char* argv[], const char** localedir)
 	Glib::setenv ("GTK_PATH", path, true);
 
 
-	// Unset GTK_RC_FILES so that we only load the RC files that we define
-	Glib::unsetenv ("GTK_RC_FILES");
+	// Unset GTK2_RC_FILES so that we only load the RC files that we define
+	Glib::unsetenv ("GTK2_RC_FILES");
 
 
 	// and set a '$HOME' environment variable. This variable changes the value returned
@@ -475,13 +479,18 @@ 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
 }
 
 
-void load_custom_fonts() 
+void load_custom_fonts()
 {
 	std::string ardour_mono_file;