use "new" VST search path code and adjust build system to reflect new source files
This commit is contained in:
parent
8ba449bc4e
commit
b8419ae7cd
@ -63,6 +63,7 @@
|
||||
#include "ardour/rc_configuration.h"
|
||||
|
||||
#include "ardour/ladspa_search_path.h"
|
||||
#include "ardour/vst_search_path.h"
|
||||
|
||||
#ifdef LV2_SUPPORT
|
||||
#include "ardour/lv2_plugin.h"
|
||||
@ -83,7 +84,6 @@
|
||||
|
||||
#include "pbd/error.h"
|
||||
#include "pbd/stl_delete.h"
|
||||
#include "pbd/fallback_folders.h"
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
@ -153,11 +153,7 @@ PluginManager::PluginManager ()
|
||||
}
|
||||
|
||||
if (windows_vst_path.length() == 0) {
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
windows_vst_path = PBD::get_platform_fallback_folder (PBD::FOLDER_VST);
|
||||
#else
|
||||
windows_vst_path = "/usr/local/lib/vst:/usr/lib/vst";
|
||||
#endif
|
||||
windows_vst_path = vst_search_path ();
|
||||
}
|
||||
|
||||
if ((s = getenv ("LXVST_PATH"))) {
|
||||
|
@ -216,6 +216,7 @@ libardour_sources = [
|
||||
'user_bundle.cc',
|
||||
'utils.cc',
|
||||
'version.cc',
|
||||
'vst_search_path.cc',
|
||||
'vumeterdsp.cc',
|
||||
'worker.cc'
|
||||
]
|
||||
|
@ -149,7 +149,7 @@ def build(bld):
|
||||
if bld.env['build_target'] == 'x86_64':
|
||||
obj.defines += [ 'USE_X86_64_ASM' ]
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
obj.source += [ 'fallback_folders.cc' ]
|
||||
obj.source += [ 'windows_special_dirs.cc' ]
|
||||
obj.linkflags += ['-lole']
|
||||
|
||||
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
|
||||
|
Loading…
Reference in New Issue
Block a user