X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=115e12cbecff34649a9ec04aa02b0c879b607a7a;hb=8488d8f6a53d3385893a435481cb60ed21c21ea0;hp=9b2e9c4b2c74c7813fa3942762e151ed8eb1fccc;hpb=2a04ff8641df26d5bdccb3061af3afea8f68fe23;p=ardour.git

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 9b2e9c4b2c..115e12cbec 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -109,6 +109,7 @@ libardour_sources = [
         'meter.cc',
         'midi_automation_list_binder.cc',
         'midi_buffer.cc',
+        'midi_channel_filter.cc',
         'midi_clock_slave.cc',
         'midi_diskstream.cc',
         'midi_model.cc',
@@ -132,6 +133,7 @@ libardour_sources = [
         'mididm.cc',
         'mtdm.cc',
         'mute_master.cc',
+        'note_fixer.cc',
         'onset_detector.cc',
         'operations.cc',
         'pan_controllable.cc',
@@ -276,8 +278,8 @@ def configure(conf):
                           atleast_version='0.16.0', mandatory=False)
         autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_19_2',
                           atleast_version='0.19.2', mandatory=False)
-        autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_21_1',
-                          atleast_version='0.21.1', mandatory=False)
+        autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_21_3',
+                          atleast_version='0.21.3', mandatory=False)
         autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
                           atleast_version='0.6.0', mandatory=False)
         conf.define ('LV2_SUPPORT', 1)
@@ -329,13 +331,17 @@ def build(bld):
     # micro increment <=> no interface changes
     LIBARDOUR_LIB_VERSION = "3.0.0"
 
+    sources = 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=libardour_sources)
+        obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=sources)
         # macros for this shared library
         obj.defines      = [ 'LIBARDOUR_DLL_EXPORTS=1' ]
     else:
-        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources)
+        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources)
         obj.cxxflags     = [ '-fPIC' ]
         obj.cflags       = [ '-fPIC' ]
         obj.defines      = []
@@ -406,6 +412,12 @@ def build(bld):
             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
         elif bld.env['build_target'] == 'x86_64':
             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
+        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. 
+	        if re.search ('/^x86_64/', str(bld.env['CC'])):
+		        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit_win.s' ]
 
     # i18n
     if bld.is_defined('ENABLE_NLS'):