fix bug in path_expand() when passed an empty string

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index d12ab3cc94594ce734944fa5909e5b010b81e68a..14811eed50795f526175bc6449c4cd0b3093aba4 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -61,6 +61,7 @@ libardour_sources = [
        'buffer_set.cc',
        'bundle.cc',
        'butler.cc',
+        'callback.cc',
        'chan_count.cc',
        'chan_mapping.cc',
        'configuration.cc',
@@ -99,6 +100,8 @@ libardour_sources = [
        'find_session.cc',
        'gain.cc',
        'globals.cc',
+       'graph.cc',
+       'graphnode.cc',
        'import.cc',
        'internal_return.cc',
        'internal_send.cc',
@@ -110,6 +113,7 @@ libardour_sources = [
        'location.cc',
        'location_importer.cc',
        'meter.cc',
+       'midi_automation_list_binder.cc',
        'midi_buffer.cc',
        'midi_clock_slave.cc',
        'midi_diskstream.cc',
@@ -144,6 +148,7 @@ libardour_sources = [
        'port_set.cc',
        'process_thread.cc',
        'processor.cc',
+       'progress.cc',
        'quantize.cc',
        'rc_configuration.cc',
        'recent_sessions.cc',
@@ -203,14 +208,14 @@ def flac_supported():
        cmd = subprocess.Popen ("sndfile-info testfile.flac", 
                                stdout = subprocess.PIPE,
                                stderr = subprocess.STDOUT, shell = True)
-       out = cmd.communicate()[0];
+       out = cmd.communicate()[0].decode('utf-8');
        return re.search ('unknown format', out) == None
 
 def ogg_supported():
        cmd = subprocess.Popen ("sndfile-info testfile.ogg", 
                                stdout = subprocess.PIPE,
                                stderr = subprocess.STDOUT, shell = True)
-       out = cmd.communicate()[0];
+       out = cmd.communicate()[0].decode('utf-8');
        return re.search ('unknown format', out) == None
 
 def set_options(opt):
@@ -222,7 +227,7 @@ def configure(conf):
        autowaf.configure(conf)
        conf.check_tool('compiler_cxx gas')
        autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2')
-       autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.119.0')
+       autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
        autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0')
        autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0')
@@ -245,6 +250,8 @@ def configure(conf):
        conf.check(header_name='wordexp.h', define_name='HAVE_WORDEXP')
 
        conf.check(header_name='jack/session.h', define_name='HAVE_JACK_SESSION')
+
+       conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
         
        conf.check_cc(fragment = "#include <jack/jack.h>\nvoid callback (int code, const char* reason, void* arg) { return; }\nint main(int argc, char **argv) { jack_client_t* c; jack_on_info_shutdown (c, callback, (void*) 0); return 0; }\n",
                       linkflags = ['-ljack'],
@@ -254,14 +261,8 @@ def configure(conf):
                       
        if flac_supported():
                conf.define ('HAVE_FLAC', 1)
-               autowaf.display_msg(conf, 'Checking for FLAC support', True)
-       else:
-               autowaf.display_msg(conf, 'Checking for FLAC support', False)
        if ogg_supported():
                conf.define ('HAVE_OGG', 1)
-               autowaf.display_msg(conf, 'Checking for Ogg/Vorbis support', True)
-       else:
-               autowaf.display_msg(conf, 'Checking for Ogg/Vorbis Support', False)
 
        conf.write_config_header('libardour-config.h')
 
@@ -280,7 +281,7 @@ def build(bld):
        obj.includes     = ['.', '../surfaces/control_protocol', '..']
        obj.name         = 'libardour'
        obj.target       = 'ardour'
-       obj.uselib       = 'GLIBMM GTHREAD AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF OSX COREAUDIO'
+       obj.uselib       = 'GLIBMM GTHREAD AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF OSX COREAUDIO CURL DL'
        obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib librubberband libaudiographer'
        obj.vnum         = LIBARDOUR_LIB_VERSION
        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
@@ -292,7 +293,7 @@ def build(bld):
                        os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
        obj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
                        os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
-        obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
+       obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
 
        #obj.source += ' st_stretch.cc st_pitch.cc '
        #obj.uselib += ' SOUNDTOUCH '
@@ -308,8 +309,10 @@ def build(bld):
                obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc' ]
                obj.uselib += ' SLV2 '
                
-       if bld.env['VST']:
+       if bld.env['VST_SUPPORT']:
                obj.source += [ 'vst_plugin.cc', 'session_vst.cc' ]
+               obj.includes += [ '../fst' ]
+               obj.cxxflags += [ '-DVST_SUPPORT' ]
 
        if bld.env['HAVE_COREAUDIO'] and bld.env['COREAUDIO']:
                obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
@@ -341,6 +344,7 @@ def build(bld):
                        test/interpolation_test.cpp
                        test/midi_clock_slave_test.cpp
                        test/resampled_source.cc
+                       test/mantis_3356.cc
                        test/testrunner.cpp
                '''.split()
                testobj.includes     = obj.includes + ['test', '../pbd']