remove a bunch of uses of long (mostly replaced by int32_t)

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 2e2211b611955bb65ca274e5997bd8a6e0670184..95682ce4779cd6e34cd0b3d4c2b022d68c5e5a57 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -5,7 +5,6 @@ import glob
 import Options
 import re
 import subprocess
-from w18n import build_i18n
 
 # Version of this package (even if built as a child)
 MAJOR = '3'
@@ -58,12 +57,14 @@ libardour_sources = [
        'beats_frames_converter.cc',
        'broadcast_info.cc',
        'buffer.cc',
+       'buffer_manager.cc',
        'buffer_set.cc',
        'bundle.cc',
        'butler.cc',
        'chan_count.cc',
        'chan_mapping.cc',
        'configuration.cc',
+       'config_text.cc',
        'control_protocol_manager.cc',
        'control_protocol_search_path.cc',
        'crossfade.cc',
@@ -79,6 +80,7 @@ libardour_sources = [
        'event_type_map.cc',
        'export_channel.cc',
        'export_channel_configuration.cc',
+       'export_failed.cc',
        'export_filename.cc',
        'export_format_base.cc',
        'export_format_manager.cc',
@@ -97,6 +99,8 @@ libardour_sources = [
        'find_session.cc',
        'gain.cc',
        'globals.cc',
+       'graph.cc',
+       'graphnode.cc',
        'import.cc',
        'internal_return.cc',
        'internal_send.cc',
@@ -108,6 +112,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',
@@ -123,6 +128,7 @@ libardour_sources = [
        'midi_track.cc',
        'midi_ui.cc',
        'mix.cc',
+        'monitor_processor.cc',
        'mtc_slave.cc',
        'mtdm.cc',
        'mute_master.cc',
@@ -139,13 +145,14 @@ libardour_sources = [
        'port.cc',
        'port_insert.cc',
        'port_set.cc',
+       'process_thread.cc',
        'processor.cc',
        'quantize.cc',
        'rc_configuration.cc',
        'recent_sessions.cc',
-       'region.cc',
        'region_factory.cc',
        'resampled_source.cc',
+       'region.cc',
        'return.cc',
        'reverse.cc',
        'route.cc',
@@ -164,6 +171,7 @@ libardour_sources = [
        'session_handle.cc',
        'session_metadata.cc',
        'session_midi.cc',
+       'session_object.cc',
        'session_playlists.cc',
        'session_process.cc',
        'session_rtevents.cc',
@@ -185,6 +193,7 @@ libardour_sources = [
        'template_utils.cc',
        'tempo.cc',
        'tempo_map_importer.cc',
+        'thread_buffers.cc',
        'ticker.cc',
        'track.cc',
        'transient_detector.cc',
@@ -216,7 +225,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.109.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')
@@ -237,7 +246,17 @@ def configure(conf):
 
        conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H')
        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'],
+                     msg = 'Checking for jack_on_info_shutdown',
+                      define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN',
+                     okmsg = 'ok')
+                      
        if flac_supported():
                conf.define ('HAVE_FLAC', 1)
                autowaf.display_msg(conf, 'Checking for FLAC support', True)
@@ -254,6 +273,8 @@ def configure(conf):
        # Boost headers
        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
        autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+       autowaf.check_header(conf, 'boost/scoped_ptr.hpp')
+       autowaf.check_header(conf, 'boost/ptr_container/ptr_list.hpp')
 
 
 def build(bld):
@@ -276,6 +297,8 @@ 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.source += ' st_stretch.cc st_pitch.cc '
        #obj.uselib += ' SOUNDTOUCH '
        #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
@@ -290,8 +313,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' ]
@@ -303,11 +328,10 @@ def build(bld):
                obj.source += [ 'audio_unit.cc' ]
 
        if bld.env['FPU_OPTIMIZATION']:
-               obj.source += [ 'sse_functions_xmm.cc' ]
                if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
-                       obj.source += [ 'sse_functions.s' ]
+                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
                elif bld.env['build_target'] == 'x86_64':
-                       obj.source += [ 'sse_functions_64bit.s' ]
+                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
 
        # i18n
        if bld.env['ENABLE_NLS']:
@@ -320,11 +344,13 @@ def build(bld):
                # Unit tests
                testobj              = bld.new_task_gen('cxx', 'program')
                testobj.source       = '''
-                       test/BBTTest.cpp
-                       test/InterpolationTest.cpp
+                       test/bbt_test.cpp
+                       test/interpolation_test.cpp
+                       test/midi_clock_slave_test.cpp
+                       test/resampled_source.cc
                        test/testrunner.cpp
                '''.split()
-               testobj.includes     = obj.includes + ['../pbd/']
+               testobj.includes     = obj.includes + ['test', '../pbd']
                testobj.uselib       = 'CPPUNIT SIGCPP JACK GLIBMM GTHREAD SAMPLERATE XML LRDF COREAUDIO'
                testobj.uselib_local = 'libpbd libmidipp libardour'
                testobj.name         = 'libardour-tests'
@@ -349,4 +375,4 @@ def shutdown():
        autowaf.shutdown()
 
 def i18n(bld):
-       build_i18n (bld, 'libs/ardour', APPNAME, libardour_sources)
+       autowaf.build_i18n (bld, 'libs/ardour', APPNAME, libardour_sources)