*** ardour3/gtk2_ardour/wscript.old	2011-09-21 05:38:46.779462147 +0000
--- ardour3/gtk2_ardour/wscript	2011-09-21 05:49:00.496120395 +0000
***************
*** 344,350 ****
      if bld.env['VST_SUPPORT']:
          obj.source += [ 'vst_pluginui.cc' ]
          obj.defines += [ 'VST_SUPPORT' ]
!         bld.env.append ('LINKFLAGS', '-lX11')
  
      if bld.env['LXVST_SUPPORT']:
          obj.source += [ 'lxvst_pluginui.cc' ]
--- 344,350 ----
      if bld.env['VST_SUPPORT']:
          obj.source += [ 'vst_pluginui.cc' ]
          obj.defines += [ 'VST_SUPPORT' ]
!         bld.env.append_unique('LINKFLAGS', '-lX11')
  
      if bld.env['LXVST_SUPPORT']:
          obj.source += [ 'lxvst_pluginui.cc' ]
***************
*** 372,378 ****
          '''
          obj.includes = '../libs/fst'
          obj.target = 'ardour-3.0-vst'
!         obj.linkflags += ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
          obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
          obj.uselib = 'ALSA'
          obj.uselib_local = ['libpbd','libmidipp','libtaglib','libardour',
--- 372,378 ----
          '''
          obj.includes = '../libs/fst'
          obj.target = 'ardour-3.0-vst'
!         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
          obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
          obj.uselib = 'ALSA'
          obj.uselib_local = ['libpbd','libmidipp','libtaglib','libardour',