X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=d12ab3cc94594ce734944fa5909e5b010b81e68a;hb=db6706429643d80e68a050daa015d17f36d5321b;hp=33de254b364e6b6e807ad8a29f9de27b96705a1b;hpb=249bc2f7443dfacb6b0ad06616196940e6fe1e6e;p=ardour.git

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 33de254b36..d12ab3cc94 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -57,6 +57,7 @@ libardour_sources = [
 	'beats_frames_converter.cc',
 	'broadcast_info.cc',
 	'buffer.cc',
+	'buffer_manager.cc',
 	'buffer_set.cc',
 	'bundle.cc',
 	'butler.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',
@@ -123,6 +125,7 @@ libardour_sources = [
 	'midi_track.cc',
 	'midi_ui.cc',
 	'mix.cc',
+        'monitor_processor.cc',
 	'mtc_slave.cc',
 	'mtdm.cc',
 	'mute_master.cc',
@@ -139,13 +142,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 +168,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 +190,7 @@ libardour_sources = [
 	'template_utils.cc',
 	'tempo.cc',
 	'tempo_map_importer.cc',
+        'thread_buffers.cc',
 	'ticker.cc',
 	'track.cc',
 	'transient_detector.cc',
@@ -216,7 +222,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.119.0')
 	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 +243,15 @@ 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_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 +268,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 +292,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'
@@ -303,11 +321,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']:
@@ -323,9 +340,10 @@ def build(bld):
 			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'