X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=a3ec926485893087ccd200002332f137fb3d5411;hb=2d5166606b2b18bda0dbe615cc07759c5a1263e2;hp=1be40f7f6391a2503d7ef95e14eb4bc225102cc4;hpb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;p=ardour.git

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 1be40f7f63..a3ec926485 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 # default state file version for this build
-CURRENT_SESSION_FILE_VERSION = 3001
+CURRENT_SESSION_FILE_VERSION = 3002
 
 I18N_PACKAGE = 'ardour'
 
@@ -57,6 +57,7 @@ libardour_sources = [
         'chan_count.cc',
         'chan_mapping.cc',
         'config_text.cc',
+        'controllable_descriptor.cc',
         'control_group.cc',
         'control_protocol_manager.cc',
         'cycle_timer.cc',
@@ -94,6 +95,7 @@ libardour_sources = [
         'filter.cc',
         'find_session.cc',
         'fixed_delay.cc',
+        'fluid_synth.cc',
         'gain_control.cc',
         'globals.cc',
         'graph.cc',
@@ -177,6 +179,7 @@ libardour_sources = [
         'rc_configuration.cc',
         'recent_sessions.cc',
         'record_enable_control.cc',
+        'record_safe_control.cc',
         'region_factory.cc',
         'resampled_source.cc',
         'region.cc',
@@ -394,9 +397,9 @@ def build(bld):
     if bld.env['build_target'] != 'mingw':
         obj.uselib += ['DL']
     if bld.is_defined('USE_EXTERNAL_LIBS'):
-        obj.uselib.extend(['VAMPSDK', 'LIBLTC'])
+        obj.uselib.extend(['VAMPSDK', 'LIBLTC', 'LIBFLUIDSYNTH'])
     else:
-        obj.use.extend(['librubberband', 'libltc_includes', 'libltc'])
+        obj.use.extend(['librubberband', 'libltc_includes', 'libltc', 'libfluidsynth_includes', 'libfluidsynth'])
 
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
@@ -495,9 +498,9 @@ def build(bld):
         testcommon.use          = ['libpbd','libmidipp','libevoral',
                                    'libaudiographer','libardour']
         if bld.is_defined('USE_EXTERNAL_LIBS'):
-            testcommon.uselib.extend(['LIBLTC',])
+            testcommon.uselib.extend(['LIBLTC', 'LIBFLUIDSYNTH'])
         else:
-            testcommon.use.extend(['libltc', 'librubberband'])
+            testcommon.use.extend(['libltc', 'librubberband', 'libfluidsynth'])
         testcommon.defines      = [
             'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'test"',
             'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
@@ -615,9 +618,9 @@ def create_ardour_test_program(bld, includes, name, target, sources):
     testobj.use          = ['libpbd','libmidipp','libevoral',
                             'libaudiographer','libardour','testcommon']
     if bld.is_defined('USE_EXTERNAL_LIBS'):
-        testobj.uselib.extend(['LIBLTC'])
+        testobj.uselib.extend(['LIBLTC', 'LIBFLUIDSYNTH'])
     else:
-        testobj.use.extend(['libltc'])
+        testobj.use.extend(['libltc', 'libfluidsynth'])
 
     testobj.name         = name
     testobj.target       = target