X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=b885da79d2549d9d45b0d47a5258bd9513e6af0c;hb=d8008b2db16a37ae3776446597a797df34fad08b;hp=c0ef56b7e36e7cb9089c651f264be8f4fffc419c;hpb=5eaaa5fcaecc54fc8cc59e6573c544906d9ea0a8;p=ardour.git

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index c0ef56b7e3..b885da79d2 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -65,6 +65,7 @@ libardour_sources = [
         'delivery.cc',
         'directory_names.cc',
         'diskstream.cc',
+        'dsp_filter.cc',
         'ebur128_analysis.cc',
         'element_import_handler.cc',
         'element_importer.cc',
@@ -90,6 +91,7 @@ libardour_sources = [
         'filesystem_paths.cc',
         'filter.cc',
         'find_session.cc',
+        'gain_control.cc',
         'globals.cc',
         'graph.cc',
         'graphnode.cc',
@@ -109,6 +111,8 @@ libardour_sources = [
         'location_importer.cc',
         'ltc_file_reader.cc',
         'ltc_slave.cc',
+        'luabindings.cc',
+        'luascripting.cc',
         'meter.cc',
         'midi_automation_list_binder.cc',
         'midi_buffer.cc',
@@ -168,6 +172,7 @@ libardour_sources = [
         'return.cc',
         'reverse.cc',
         'route.cc',
+        'route_controls.cc',
         'route_graph.cc',
         'route_group.cc',
         'route_group_member.cc',
@@ -335,10 +340,11 @@ def build(bld):
     # micro increment <=> no interface changes
     LIBARDOUR_LIB_VERSION = "3.0.0"
 
-    sources = libardour_sources
+    # operate on copy to avoid adding sources twice
+    sources = list(libardour_sources)
     if bld.is_tracks_build():
         sources += [ 'engine_state_controller.cc' ]
-    
+
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=sources)
@@ -360,6 +366,7 @@ def build(bld):
     obj.use          = ['libpbd','libmidipp','libevoral',
                         'libaudiographer',
                         'libtimecode',
+                        'liblua',
                         ]
     if bld.env['build_target'] != 'mingw':
         obj.uselib += ['DL']
@@ -423,12 +430,12 @@ def build(bld):
         elif bld.env['build_target'] == 'mingw':
                 # usability of the 64 bit windows assembler depends on the compiler target,
                 # not the build host, which in turn can only be inferred from the name
-                # of the compiler. 
+                # of the compiler.
                 if re.search ('x86_64-w64', str(bld.env['CC'])):
                         obj.source += [ 'sse_functions_xmm.cc' ]
                         obj.source += [ 'sse_functions_64bit_win.s',  'sse_avx_functions_64bit_win.s' ]
                         avx_sources = [ 'sse_functions_avx.cc' ]
-        
+
         if avx_sources:
             # as long as we want to use AVX intrinsics in this file,
             # compile it with -mavx flag - append avx flag to the existing
@@ -439,11 +446,11 @@ def build(bld):
                 source   = avx_sources,
                 cxxflags = avx_cxxflags,
                 includes = [ '.' ],
-                use = [ 'libtimecode', 'libpbd', 'libevoral', ],
+                use = [ 'libtimecode', 'libpbd', 'libevoral', 'liblua' ],
                 target   = 'sse_avx_functions')
-            
+
             obj.use += ['sse_avx_functions' ]
-        
+
     # i18n
     if bld.is_defined('ENABLE_NLS'):
         mo_files = bld.path.ant_glob('po/*.mo')
@@ -526,23 +533,24 @@ def build(bld):
 
         create_ardour_test_program(bld, obj.includes, 'libardour-tests', 'run-tests', test_sources)
 
-        # Tester to just load a session
-        session_load_tester = bld(features = 'cxx cxxprogram')
-        session_load_tester.source = '''
+        # Utility to load and save a session
+        load_save_session = bld(features = 'cxx cxxprogram')
+        load_save_session.source = '''
                     test/test_util.cc
-                    test/load_session.cc
+                    test/test_ui.cc
+                    test/load_save_session.cc
                     test/dummy_lxvst.cc
             '''.split()
 
-        session_load_tester.includes  = obj.includes
-        session_load_tester.includes.append ('test')
-        session_load_tester.uselib    = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
+        load_save_session.includes  = obj.includes
+        load_save_session.includes.append ('test')
+        load_save_session.uselib    = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
                              'SAMPLERATE','XML','LRDF','COREAUDIO']
-        session_load_tester.use       = ['libpbd','libmidipp','libardour']
-        session_load_tester.name      = 'libardour-session-load-tester'
-        session_load_tester.target    = 'load-session'
-        session_load_tester.install_path = ''
-        session_load_tester.defines      = [
+        load_save_session.use       = ['libpbd','libmidipp','libardour']
+        load_save_session.name      = 'libardour-load-save-session'
+        load_save_session.target    = 'load-save-session'
+        load_save_session.install_path = ''
+        load_save_session.defines      = [
             'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'profile"',
             'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
             'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',