X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Faudiographer%2Fwscript;h=7ac9f8f4fa2593332b81e4ccfcc1edd6278574cc;hb=d50df82799665e4bbf7c9d8cf2a7c2af866f0da2;hp=9e2d1c4c3c70a82584eafcb105ec4f1d147e5414;hpb=b855e5f3220027502a3c88f189d511fe2a5a3c2b;p=ardour.git

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 9e2d1c4c3c..7ac9f8f4fa 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -36,6 +36,8 @@ def configure(conf):
     autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0', mandatory=False)
     autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.7', mandatory=False)
     autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18', mandatory=False)
+    autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
+    autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW35F', atleast_version='3.3.5', mandatory=False)
 
     # Boost headers
     autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
@@ -54,12 +56,18 @@ def build(bld):
                                    and bld.is_defined('HAVE_GLIBMM')
                                    and bld.is_defined('HAVE_GTHREAD'))
 
+    if bld.is_defined('HAVE_FFTW35F') and bld.env['build_target'] != 'mingw':
+        bld.env['LIB_FFTW3F'] += ['fftw3f_threads']
+
     audiographer_sources = [
         'private/gdither/gdither.cc',
         'src/general/sample_format_converter.cc',
         'src/routines.cc',
         'src/debug_utils.cc',
-        'src/general/broadcast_info.cc'
+        'src/general/analyser.cc',
+        'src/general/broadcast_info.cc',
+        'src/general/loudness_reader.cc',
+        'src/general/normalizer.cc'
         ]
     if bld.is_defined('HAVE_SAMPLERATE'):
         audiographer_sources += [ 'src/general/sr_converter.cc' ]
@@ -67,13 +75,9 @@ def build(bld):
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         audiographer              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=audiographer_sources)
         # macros for this shared library
-        audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL=1', 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
-        # macros for this other internal shared libraries that we use
-        audiographer.defines     += [ 'LIBPBD_DLL=1' ]
-        audiographer.cflags       = [ '-fvisibility=hidden' ]
-        audiographer.cxxflags     = [ '-fvisibility=hidden' ]
+        audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
     else:
-        audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources)
+        audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=audiographer_sources)
         audiographer.cxxflags     = [ '-fPIC' ]
         audiographer.cflags       = [ '-fPIC' ]
         audiographer.defines      = []
@@ -81,11 +85,11 @@ def build(bld):
     audiographer.name           = 'libaudiographer'
     audiographer.target         = 'audiographer'
     audiographer.export_includes = ['.', './src']
-    audiographer.includes       = ['.', './src']
-    audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
+    audiographer.includes       = ['.', './src','../ardour','../timecode','../evoral']
+    audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE FFTW3F VAMPSDK VAMPHOSTSDK XML'
     audiographer.use            = 'libpbd'
     audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION
-    audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    audiographer.install_path   = bld.env['LIBDIR']
 
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
@@ -121,7 +125,7 @@ def build(bld):
             '''
 
         obj.use          = 'libaudiographer'
-        obj.uselib       = 'CPPUNIT GLIBMM'
+        obj.uselib       = 'CPPUNIT GLIBMM SAMPLERATE SNDFILE FFTW3F VAMPSDK VAMPHOSTSDK'
         obj.target       = 'run-tests'
         obj.install_path = ''