Make foldback bus match foldback sends namewise

[ardour.git] / gtk2_ardour / bundle_env_mingw.cc

diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc
index f53c461299f8fc878310f1ee2f53fdc633b32981..6ee1e0f7a24be27c66b9346e9fb51965ad761ded 100644 (file)
--- a/gtk2_ardour/bundle_env_mingw.cc
+++ b/gtk2_ardour/bundle_env_mingw.cc
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string>
 #include "bundle_env.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <glibmm.h>
 #include <fontconfig/fontconfig.h>
@@ -29,7 +29,6 @@
 
 #include <windows.h>
 #include <wingdi.h>
-#include <shlobj.h> // CSIDL_*
 
 #include "ardour/ardour.h"
 #include "ardour/search_paths.h"
@@ -37,53 +36,11 @@
 
 #include "pbd/file_utils.h"
 #include "pbd/epa.h"
-#include "pbd/windows_special_dirs.h"
 
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
-
-/* query top-level Ardour installation path.
- * Typically, this will be somehwere like
- * "C:\Program Files (x86)\Ardour"
- */
-const std::string
-get_install_path ()
-{
-       const gchar* pExeRoot = g_win32_get_package_installation_directory_of_module (0);
-
-       if (0 == pExeRoot) {
-               HKEY key;
-               DWORD size = PATH_MAX;
-               char tmp[PATH_MAX+1];
-               if (
-#ifdef __MINGW64__
-                               (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\w64", 0, KEY_READ, &key))
-#else
-                               (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\w32", 0, KEY_READ, &key))
-#endif
-                               &&(ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
-                        )
-               {
-                       pExeRoot = Glib::locale_to_utf8(tmp).c_str();
-               }
-       }
-
-       if (0 == pExeRoot) {
-               const char *program_files = PBD::get_win_special_folder (CSIDL_PROGRAM_FILES);
-               if (program_files) {
-                       pExeRoot = g_build_filename(program_files, PROGRAM_NAME, NULL);
-               }
-       }
-
-       if (pExeRoot && Glib::file_test(pExeRoot, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
-               return std::string (pExeRoot);
-       }
-       return "";
-}
-
-
 void
 fixup_bundle_environment (int, char* [], string & localedir)
 {
@@ -93,8 +50,8 @@ fixup_bundle_environment (int, char* [], string & localedir)
        // setting a FONTCONFIG_FILE won't hurt either see bundle_env_msvc.cc
        // (pangocairo prefers the windows gdi backend unless PANGOCAIRO_BACKEND=fc is set)
 
-       // Unset GTK_RC_FILES so that only ardour specific files are loaded
-       Glib::unsetenv ("GTK_RC_FILES");
+       // Unset GTK2_RC_FILES so that only ardour specific files are loaded
+       Glib::unsetenv ("GTK2_RC_FILES");
 
        std::string path;
 
@@ -123,6 +80,15 @@ fixup_bundle_environment (int, char* [], string & localedir)
        Glib::setenv ("VAMP_PATH", path, true);
 
        Glib::setenv ("SUIL_MODULE_DIR", Glib::build_filename(ardour_dll_directory(), "suil"), true);
+
+       /* XXX this should really be PRODUCT_EXE see tools/x-win/package.sh
+        * ardour on windows does not have a startup wrapper script.
+        *
+        * then again, there's probably nobody using NSM on windows.
+        * because neither nsmd nor the GUI is currently available for windows.
+        * furthermore it'll be even less common for derived products.
+        */
+       Glib::setenv ("ARDOUR_SELF", Glib::build_filename(ardour_dll_directory(), "ardour.exe"), true);
 }
 
 static __cdecl void