diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
| commit | 813c5f0af9d1dac32b156ef3c72b890a7cf9eab5 (patch) | |
| tree | 29aa92a68feb1557c60500969d6d5aeade6a2e9b /libs/ardour/control_protocol_manager.cc | |
| parent | 433b6651ee8450da8282330ac35cb7ec1abbab6f (diff) | |
major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)
git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/control_protocol_manager.cc')
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 59001dce14..2931fe46e5 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -210,7 +210,7 @@ ControlProtocolManager::discover_control_protocols () dylib_extension_pattern, cp_modules); DEBUG_TRACE (DEBUG::ControlProtocols, - string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string())); + string_compose (_("looking for control protocols in %1\n"), control_protocol_search_path().to_string())); for (vector<sys::path>::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) { control_protocol_discover ((*i).to_string()); @@ -222,12 +222,14 @@ ControlProtocolManager::control_protocol_discover (string path) { ControlProtocolDescriptor* descriptor; - /* don't load shared objects that are just symlinks to the real thing. +#ifdef __APPLE__ + /* don't load OS X shared objects that are just symlinks to the real thing. */ - if (Glib::file_test (path, Glib::FILE_TEST_IS_SYMLINK)) { + if (path.find (".dylib") && Glib::file_test (path, Glib::FILE_TEST_IS_SYMLINK)) { return 0; } +#endif if ((descriptor = get_descriptor (path)) != 0) { |