diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-04 17:57:05 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-04 17:57:05 +0200 |
| commit | 29d89f012826cd6b19040c8511dec39cca7fbd01 (patch) | |
| tree | bcc847a50519ebd429d50eba511e21db720eabc9 /libs | |
| parent | 3f7986198b1e30a5733f5d42a978deb738460fef (diff) | |
update VST scanner lookup (prepare for moving to BINDIR)
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index aa2db88278..2a7eeb9394 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -115,16 +115,23 @@ PluginManager::PluginManager () char* s; string lrdf_path; - string scan_p = Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst"); - if (!PBD::find_file (PBD::Searchpath(scan_p), +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT + PBD::Searchpath vstsp(Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst")); +#ifdef PLATFORM_WINDOWS + vstsp += Glib::build_filename(g_win32_get_package_installation_directory_of_module (0), "bin"); +#else + vstsp += Glib::getenv("PATH"); +#endif + if (!PBD::find_file (vstsp, #ifdef PLATFORM_WINDOWS "ardour-vst-scanner.exe" #else "ardour-vst-scanner" #endif , scanner_bin_path)) { - PBD::warning << "VST scanner app (ardour-vst-scanner) not found in path " << scan_p << endmsg; + PBD::warning << "VST scanner app (ardour-vst-scanner) not found in path " << vstsp.to_string() << endmsg; } +#endif load_statuses (); |