1 files changed, 44 insertions, 47 deletions

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 07ff4f4be3..578409c4ae 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -266,6 +266,8 @@ def configure(conf):
 
     # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present
 
+    autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F',
+                      mandatory=True)
     autowaf.check_pkg(conf, 'flac', uselib_store='FLAC',
                       atleast_version='1.2.1')
     autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD',
@@ -357,23 +359,25 @@ def build(bld):
     if bld.is_defined('WINDOWS_VST_SUPPORT'):
         # If we require VST support we build a stub main() and the FST library
         # here using winegcc, and link it to the GTK front-end library
-        obj = bld(features = 'cxx c cxxprogram wine')
-        obj.source = '''
-                ../libs/fst/fst.c
-                ../libs/fst/fstinfofile.c
-                ../libs/fst/vsti.c
-                ../libs/fst/vstwin.c
-                ../vst/winmain.c
-        '''
-        obj.uselib = 'ALSA'
+        obj = bld (features = 'cxx c cxxprogram wine')
+        obj.source = (
+            '../libs/fst/fst.c',
+            '../libs/fst/fstinfofile.c',
+            '../libs/fst/vsti.c',
+            '../libs/fst/vstwin.c',
+            '../vst/winmain.c',
+            )
+        #
+        # XXX do we really need to explicitly link to all of these for the wine executable?
+        #
         obj.use          = [ 'libpbd',
                              'libmidipp',
-                             'libtaglib',
                              'libardour',
                              'libardour_cp',
+                             'libtimecode',
+                             'libmidipp',
                              'libgtk2_ardour',
                              'libgtkmm2ext',
-                             'libtaglib',
                              'libcanvas'
                              ]
         obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
@@ -391,47 +395,24 @@ def build(bld):
         obj.target    = 'gtk2_ardour'
     else:
         # just the normal executable version of the GTK GUI
-        obj = bld(features = 'cxx c cxxprogram')
+        obj = bld (features = 'cxx c cxxprogram')
         obj.source    = gtk2_ardour_sources
         obj.target = 'ardour-' + bld.env['VERSION']
         obj.includes = ['.']
-        obj.defines = []
-
-    # if our internal libraries are built as DLL's, define
-    # the macros that activate the right stuff in headers
-    # for export/visibility to work on all platforms.
-
-    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj.defines += [ 'LIBPBD_DLL=1', 
-                         'LIBARDOUR_DLL=1',
-                         'LIBMIDIPP_DLL=1',
-                         'LIBARDOUR_DLL=1',
-                         'LIBARDOUR_CP_DLL=1',
-                         'LIBGTKMM2EXT_DLL=1',
-                         'LIBEVORAL_DLL=1',
-                         ]
-    # continue with setup of obj, which could be a shared library
-    # or an executable.
 
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # at this point, "obj" refers to either the normal native executable
+    # OR the shared library built for use with wine on linux.
 
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL GTKMM LO'
-    obj.use          = [ 'libpbd',
-                         'libmidipp',
-                         'libtaglib',
-                         'libardour',
-                         'libardour_cp',
-                         'libgtkmm2ext',
-                         'libtaglib',
-                         'libcanvas'
-                         ]
-    if bld.env['build_target'] == 'mingw':
-	if bld.env['DEBUG'] == False:
-            obj.linkflags = ['-mwindows']
-    if sys.platform == 'darwin':
-        obj.uselib += ' AUDIOUNITS OSX GTKOSX'
-        obj.use    += ' libappleutility'
-    obj.defines     += [
+    obj.use      = [ 'libpbd',
+                     'libardour',
+                     'libardour_cp',
+                     'libtimecode',
+                     'libmidipp',
+                     'libgtkmm2ext',
+                     'libcanvas',
+                     ]
+
+    obj.defines = [
         'PACKAGE="' + I18N_PACKAGE + '"',
         'VERSIONSTRING="' + bld.env['VERSION'] + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
@@ -439,8 +420,24 @@ def build(bld):
         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
         ]
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
+    obj.uselib       += ' GTKMM CANVAS FFTW3F'
+    obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
+
+    if bld.is_defined('USE_EXTERNAL_LIBS'):
+        obj.uselib += ' TAGLIB'
+    else:
+        obj.use += ('libtaglib')
+    if sys.platform == 'darwin':
+        obj.uselib += ' AUDIOUNITS OSX GTKOSX'
+        obj.use    += ' libappleutility'
     obj.includes += ['../libs']
 
+    if bld.env['build_target'] == 'mingw':
+	if bld.env['DEBUG'] == False:
+            obj.linkflags = ['-mwindows']
+
     if bld.is_defined('HAVE_SUIL'):
         obj.source += [ 'lv2_plugin_ui.cc' ]
         obj.use += [ 'SUIL' ]