use running_from_source_tree()

[ardour.git] / gtk2_ardour / bundle_env_linux.cc

diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc
index 1766021da115a2ff7618ab048348cc0819c95122..2586ad5dcd79a12de819d650660372b5e9272ad0 100644 (file)
--- a/gtk2_ardour/bundle_env_linux.cc
+++ b/gtk2_ardour/bundle_env_linux.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <fstream>
 #include <string>
 #include <vector>
 #include <cerrno>
@@ -60,6 +59,12 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir)
 
        std::string path;
        std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0]));
+#if defined WINDOWS_VST_SUPPORT
+       // argv[0] will be "wine"
+       if (g_getenv ("INSTALL_DIR")) {
+               dir_path = g_getenv ("INSTALL_DIR");
+       }
+#endif
 
 #ifdef ENABLE_NLS
        if (!ARDOUR::translations_are_enabled ()) {
@@ -89,10 +94,10 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir)
        g_setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1);
        g_setenv ("PATH", (dir_path + "/bin:" + std::string(g_getenv ("PATH"))).c_str(), 1);
 
-       /* unset GTK_RC_FILES so that we only load the RC files that we define
+       /* unset GTK2_RC_FILES so that we only load the RC files that we define
         */
 
-       g_unsetenv ("GTK_RC_FILES");
+       g_unsetenv ("GTK2_RC_FILES");
 
        /* Tell fontconfig where to find fonts.conf. Use the system version
           if it exists, otherwise use the stuff we included in the bundle
@@ -112,8 +117,8 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir)
 
 }
 
-void 
-load_custom_fonts() 
+void
+load_custom_fonts()
 {
        std::string ardour_mono_file;