X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Ffst%2Fwscript;h=9fe165ca9ebbe08caa0568c3734ae629c4c28515;hb=70160db4bedc7f782d12125496ec354b1ca35569;hp=44ff9a812814037d3b87a4400a50f8caa0ab0d93;hpb=912f07b919c1ec44f0cdd5278d74a9bc29b91846;p=ardour.git

diff --git a/libs/fst/wscript b/libs/fst/wscript
index 44ff9a8128..9fe165ca9e 100644
--- a/libs/fst/wscript
+++ b/libs/fst/wscript
@@ -18,7 +18,7 @@ scanner_app_src = [
     ]
 
 # needed for code used from libardour
-I18N_PACKAGE = 'ardour3'
+I18N_PACKAGE = 'ardour'
 
 def options(opt):
     autowaf.set_options(opt)
@@ -27,7 +27,7 @@ def configure(conf):
     conf.load('misc')
     conf.load('compiler_cxx')
     autowaf.configure(conf)
-    if conf.env['WINDOWS_VST_SUPPORT'] == True and bld.env['build_target'] == 'mingw':
+    if conf.env['WINDOWS_VST_SUPPORT'] == True and Options.options.dist_target == 'mingw':
         conf.check(compiler='cxx',
                    lib='gdi32',
                    mandatory=True,
@@ -47,11 +47,11 @@ def build(bld):
 
     if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
         # wine exec wrapper script
-        obj = bld(features = 'subst', rule= 'chmod 0755 ${TGT}')
+        obj = bld(features = 'subst')
         obj.source = 'scanner.wine'
         obj.target = 'ardour-vst-scanner'
         obj.chmod  = Utils.O755
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3/fst')
+        obj.install_path = os.path.join(bld.env['LIBDIR'])
         obj.dict   = {
             'VERSION' : bld.env['VERSION'],
                 }
@@ -59,27 +59,33 @@ def build(bld):
         obj = bld (features = 'c cxx cxxprogram wine')
         obj.source = (
             'scanner.cc',
-            'fst.c',
             'vstwin.c',
             )
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
+        obj.linkflags += bld.env['LDFLAGS']
         obj.target = 'ardour-vst-scanner.exe.so'
         obj.uselib = ['GIOMM', 'DL']
+        obj.use = [ 'libpbd' ]
+        obj.cxxflags  = [ '-fPIC' ]
     else:
         obj = bld (features = 'cxx c cxxprogram')
+        obj.source = ( 'scanner.cc' )
+        obj.target = 'ardour-vst-scanner'
         if bld.is_defined('WINDOWS_VST_SUPPORT'):
-            obj.source = ( 'scanner.cc', 'fst.c', 'vstwin.c' )
+            bld (features = 'c', name='vstwin', source='vstwin.c', uselib = 'GIOMM', includes  = [ '../pbd/', '../ardour/', '.' ])
             obj.uselib = ['GIOMM', 'DL', 'GDI32']
+            obj.linkflags = ['-mwindows']
+            obj.use = [ 'libpbd', 'vstwin' ]
         else:
-            obj.source = ( 'scanner.cc' )
             obj.uselib = ['GIOMM', 'DL']
-        obj.target = 'ardour-vst-scanner'
+            obj.use = [ 'libpbd' ]
 
     obj.includes  = [ '../pbd/', '../ardour/', '.' ]
     obj.defines = [
         '_POSIX_SOURCE',
         'USE_WS_PREFIX',
         'VST_SCANNER_APP',
-        'PACKAGE="' + I18N_PACKAGE + '"',
+        'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',
+        'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
         ]
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3/fst')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])