diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-17 09:50:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-17 09:50:32 +0000 |
| commit | e5e0ceec92e1916b8f8524ca64ce40467c466015 (patch) | |
| tree | 9f0d7cf456e246b927d6e6bb96b46a316a508eeb /gtk2_ardour/main.cc | |
| parent | 75c60c9b8b708eaed036c50e7cfb08e5d4ae3b9f (diff) | |
fix up initialization of various path vars in bundled OS X version; make LADSPA_PATH augment the standard LADSPA search path, not replace it
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3978 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 51c1928d20..c4b9b9a897 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -83,7 +83,10 @@ fixup_bundle_environment () Glib::ustring path; const char *cstr = getenv ("PATH"); - /* ensure that we find any bundled executables (e.g. JACK) */ + /* ensure that we find any bundled executables (e.g. JACK), + and find them before any instances of the same name + elsewhere in PATH + */ path = dir_path; if (cstr) { @@ -118,8 +121,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Plugins"; setenv ("LADSPA_PATH", path.c_str(), 1); @@ -128,8 +133,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Frameworks"; setenv ("VAMP_PATH", path.c_str(), 1); @@ -138,8 +145,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Surfaces"; setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1); @@ -148,8 +157,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Plugins"; setenv ("LV2_PATH", path.c_str(), 1); @@ -184,8 +195,11 @@ fixup_bundle_environment () error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg; } else { pangorc << "[Pango]\nModuleFiles="; - Glib::ustring mpath = dir_path; + Glib::ustring mpath; + + mpath = dir_path; mpath += "/../Resources/pango.modules"; + pangorc << mpath << endl; pangorc.close (); |