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

diff --git a/libs/fst/wscript b/libs/fst/wscript
index c2afdd71fa..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)
@@ -66,22 +66,26 @@ def build(bld):
         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', '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.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'])