consolidate Session::locate() and Session::do_locate()

[ardour.git] / libs / audiographer / wscript

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index d1863cf49b3c3c55e250bd61e1aece0b2414b643..7c04604906d2194751c1e64614a8c051067a355f 100644 (file)
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -37,7 +37,6 @@ def configure(conf):
     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')
@@ -66,6 +65,7 @@ def build(bld):
         'src/debug_utils.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'):
@@ -77,14 +77,14 @@ def build(bld):
         audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
     else:
         audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=audiographer_sources)
-        audiographer.cxxflags     = [ '-fPIC' ]
-        audiographer.cflags       = [ '-fPIC' ]
+        audiographer.cxxflags     = [  bld.env['compiler_flags_dict']['pic'] ]
+        audiographer.cflags       = [ bld.env['compiler_flags_dict']['pic'] ]
         audiographer.defines      = []
 
     audiographer.name           = 'libaudiographer'
     audiographer.target         = 'audiographer'
     audiographer.export_includes = ['.', './src']
-    audiographer.includes       = ['.', './src','../ardour','../timecode','../evoral']
+    audiographer.includes       = ['.', './src','../ardour','../temporal','../evoral']
     audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE FFTW3F VAMPSDK VAMPHOSTSDK XML'
     audiographer.use            = 'libpbd'
     audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION