X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_env_msvc.cc;h=9932a190275afa08a0a263645375130cc0615cdd;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=981553c179b4ce8b51072fb461549bb92887ea79;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc
index 981553c179..9932a19027 100644
--- a/gtk2_ardour/bundle_env_msvc.cc
+++ b/gtk2_ardour/bundle_env_msvc.cc
@@ -18,7 +18,7 @@
 */
 
 #include "bundle_env.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <shlobj.h>
 #include <stdlib.h>
@@ -29,7 +29,7 @@
 #include <fstream>
 
 #include <glibmm.h>
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
 #include <fontconfig/fontconfig.h>
 
@@ -386,21 +386,6 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir)
 	Glib::setenv ("ARDOUR_CONFIG_PATH", path, true);
 
 
-	// Next, set up 'ARDOUR_PATH'
-	path  = user_config_directory();
-	path  = Glib::path_get_dirname (path);
-	path += G_SEARCHPATH_SEPARATOR;
-	path += windows_search_path().to_string();
-	path += "\\icons;";
-	path += windows_search_path().to_string();
-	path += "\\pixmaps;";
-	path += ardour_data_search_path().to_string();  // In fact, adds both the 'data' search
-	path += G_SEARCHPATH_SEPARATOR;                 // path and our 'config' search path
-	path += dir_path;
-	path += "\\etc";
-	Glib::setenv ("ARDOUR_PATH", path, true);
-
-
 	// Next, set up 'ARDOUR_INSTANT_XML_PATH'
 	path = user_config_directory();
 	Glib::setenv ("ARDOUR_INSTANT_XML_PATH", path, true);
@@ -467,8 +452,8 @@ fixup_bundle_environment (int argc, char* argv[], string & 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