X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=95682ce4779cd6e34cd0b3d4c2b022d68c5e5a57;hb=c11c01ef200ce01ec454ff1d8023732d2cd6b06e;hp=bb6869b0487432bafc1e05ef2ad89f6a98ae7d8e;hpb=d56817e7856040adf3db6bda812dfaef7d493c80;p=ardour.git

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index bb6869b048..95682ce477 100644
--- 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,17 +57,20 @@ 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',
 	'cycle_timer.cc',
 	'default_click.cc',
+	'debug.cc',
 	'delivery.cc',
 	'directory_names.cc',
 	'diskstream.cc',
@@ -78,27 +80,27 @@ libardour_sources = [
 	'event_type_map.cc',
 	'export_channel.cc',
 	'export_channel_configuration.cc',
-	'export_file_io.cc',
+	'export_failed.cc',
 	'export_filename.cc',
 	'export_format_base.cc',
 	'export_format_manager.cc',
 	'export_format_specification.cc',
 	'export_formats.cc',
+	'export_graph_builder.cc',
 	'export_handler.cc',
 	'export_preset.cc',
-	'export_processor.cc',
 	'export_profile_manager.cc',
 	'export_status.cc',
 	'export_timespan.cc',
-	'export_utilities.cc',
 	'file_source.cc',
 	'filename_extensions.cc',
 	'filesystem_paths.cc',
 	'filter.cc',
 	'find_session.cc',
 	'gain.cc',
-	'gdither.cc',
 	'globals.cc',
+	'graph.cc',
+	'graphnode.cc',
 	'import.cc',
 	'internal_return.cc',
 	'internal_send.cc',
@@ -110,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,7 +126,9 @@ libardour_sources = [
 	'midi_state_tracker.cc',
 	'midi_stretch.cc',
 	'midi_track.cc',
+	'midi_ui.cc',
 	'mix.cc',
+        'monitor_processor.cc',
 	'mtc_slave.cc',
 	'mtdm.cc',
 	'mute_master.cc',
@@ -131,6 +136,7 @@ libardour_sources = [
 	'onset_detector.cc',
 	'panner.cc',
 	'pcm_utils.cc',
+	'pi_controller.cc',
 	'playlist.cc',
 	'playlist_factory.cc',
 	'plugin.cc',
@@ -139,17 +145,19 @@ 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',
 	'route_group.cc',
+	'route_group_member.cc',
 	'rb_effect.cc',
 	'send.cc',
 	'session.cc',
@@ -160,14 +168,19 @@ libardour_sources = [
 	'session_directory.cc',
 	'session_events.cc',
 	'session_export.cc',
+	'session_handle.cc',
 	'session_metadata.cc',
 	'session_midi.cc',
+	'session_object.cc',
+	'session_playlists.cc',
 	'session_process.cc',
+	'session_rtevents.cc',
 	'session_state.cc',
 	'session_state_utils.cc',
 	'session_time.cc',
 	'session_transport.cc',
 	'session_utils.cc',
+	'slave.cc',
 	'smf_source.cc',
 	'sndfile_helpers.cc',
 	'sndfileimportable.cc',
@@ -180,6 +193,7 @@ libardour_sources = [
 	'template_utils.cc',
 	'tempo.cc',
 	'tempo_map_importer.cc',
+        'thread_buffers.cc',
 	'ticker.cc',
 	'track.cc',
 	'transient_detector.cc',
@@ -211,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')
@@ -232,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)
@@ -249,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):
@@ -259,8 +285,8 @@ def build(bld):
 	obj.includes     = ['.', '../surfaces/control_protocol', '..']
 	obj.name         = 'libardour'
 	obj.target       = 'ardour'
-	obj.uselib       = 'GLIBMM AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF OSX'
-	obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib librubberband'
+	obj.uselib       = 'GLIBMM GTHREAD AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF OSX COREAUDIO'
+	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')
 	obj.cxxflags     = ['-DPACKAGE="libardour3"']
@@ -271,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'
@@ -285,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' ]
@@ -298,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']:
@@ -311,23 +340,39 @@ def build(bld):
 			lang = os.path.basename (mo).replace ('.mo', '')
 			bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo)
 
-	if bld.env['HAVE_CPPUNIT']:
+	if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
 		# Unit tests
 		testobj              = bld.new_task_gen('cxx', 'program')
 		testobj.source       = '''
-			interpolation.cc
-			tests/interpolation-test.cc
-			tests/testrunner.cpp
-		'''
-		testobj.includes     = obj.includes + ['../pbd/']
-		testobj.uselib       = 'CPPUNIT SIGCPP JACK GLIBMM SAMPLERATE'
+			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 + ['test', '../pbd']
+		testobj.uselib       = 'CPPUNIT SIGCPP JACK GLIBMM GTHREAD SAMPLERATE XML LRDF COREAUDIO'
+		testobj.uselib_local = 'libpbd libmidipp libardour'
 		testobj.name         = 'libardour-tests'
 		testobj.target       = 'run-tests'
 		testobj.install_path = ''
-
+		testobj.cxxflags     = ['-DPACKAGE="libardour3test"']
+		testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+		testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+		testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
+		testobj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
+				os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
+		testobj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
+				os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
+		if bld.env['FPU_OPTIMIZATION']:
+			testobj.source += [ 'sse_functions_xmm.cc' ]
+			if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
+				testobj.source += [ 'sse_functions.s' ]
+			elif bld.env['build_target'] == 'x86_64':
+				testobj.source += [ 'sse_functions_64bit.s' ]
 
 def shutdown():
 	autowaf.shutdown()
 
 def i18n(bld):
-	build_i18n (bld, 'libs/ardour', APPNAME, libardour_sources)
+	autowaf.build_i18n (bld, 'libs/ardour', APPNAME, libardour_sources)