diff options
| author | Robin Gareus <robin@gareus.org> | 2014-02-25 09:43:40 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-02-25 14:57:57 +0100 |
| commit | e2adf46e0ff8174410ba5b14a1d6aed8c5c8faf1 (patch) | |
| tree | 043a1a44dcf53fe88f39c1a9d41acd6619aedd03 /libs/fst | |
| parent | 993ed5670175870c5b5930860e82db0efe158820 (diff) | |
update external VST scanner app
Diffstat (limited to 'libs/fst')
| -rw-r--r-- | libs/fst/scanner.cc | 4 | ||||
| -rw-r--r-- | libs/fst/scanner.wine | 4 | ||||
| -rw-r--r-- | libs/fst/wscript | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libs/fst/scanner.cc b/libs/fst/scanner.cc index 8225993b4e..ca95b25471 100644 --- a/libs/fst/scanner.cc +++ b/libs/fst/scanner.cc @@ -39,13 +39,13 @@ int main (int argc, char **argv) { char *dllpath = argv[1]; std::vector<VSTInfo *> *infos; #ifdef LXVST_SUPPORT - if (strstr (dllpath, ".so" ) == 0) { + if (strstr (dllpath, ".so")) { infos = vstfx_get_info_lx(dllpath); } #endif #ifdef WINDOWS_VST_SUPPORT - if (strstr (dllpath, ".dll" ) == 0) { + if (strstr (dllpath, ".dll")) { infos = vstfx_get_info_fst(dllpath); } #endif diff --git a/libs/fst/scanner.wine b/libs/fst/scanner.wine index 1e3b5e627f..ac39b5b339 100644 --- a/libs/fst/scanner.wine +++ b/libs/fst/scanner.wine @@ -1,2 +1,2 @@ -#/bin/sh -exec wine "`dirname "$0"`/ardour-@VERSION@-vst-scanner.exe.so" "$@" +#!/bin/sh +exec wine "`dirname "$0"`/ardour-vst-scanner.exe.so" "$@" diff --git a/libs/fst/wscript b/libs/fst/wscript index 4f4de4e2ff..e15613d9c0 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -44,9 +44,9 @@ def build(bld): # wine exec wrapper script obj = bld(features = 'subst', rule= 'chmod 0755 ${TGT}') obj.source = 'scanner.wine' - obj.target = 'ardour-' + bld.env['VERSION'] + '-vst-scanner' + obj.target = 'ardour-vst-scanner' obj.chmod = Utils.O755 - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3/fst') obj.dict = { 'VERSION' : bld.env['VERSION'], } @@ -57,12 +57,12 @@ def build(bld): 'fst.c', 'vstwin.c', ) - obj.target = 'ardour-' + bld.env['VERSION'] + '-vst-scanner.exe.so' obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] + obj.target = 'ardour-vst-scanner.exe.so' else: obj = bld (features = 'cxx c cxxprogram') obj.source = ( 'scanner.cc' ) - obj.target = 'ardour-' + bld.env['VERSION'] + '-vst-scanner' + obj.target = 'ardour-vst-scanner' obj.includes = [ '../pbd/', '../ardour/', '.' ] obj.defines = [ @@ -71,5 +71,5 @@ def build(bld): 'VST_SCANNER_APP', 'PACKAGE="' + I18N_PACKAGE + '"', ] - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3/fst') obj.uselib = ['GIOMM', 'DL'] |