X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=1d40f660db0e4158f5fedfcbe3d97e71443f2ac9;hb=8367b7cab344e75908744a95fda860c7fadff420;hp=947ba0fbe20993f160104be9e49072368909c596;hpb=126b3c2417829befe71c425b98856a32ebcd699d;p=ardour.git

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 947ba0fbe2..1d40f660db 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -331,15 +331,19 @@ 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.cxxflags     = [ '-fPIC' ]
-        obj.cflags       = [ '-fPIC' ]
+        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources)
+        obj.cxxflags     = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags       = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = []
 
     obj.export_includes = ['.']
@@ -403,18 +407,39 @@ def build(bld):
     if bld.is_defined('AUDIOUNIT_SUPPORT'):
         obj.source += [ 'audio_unit.cc' ]
 
+    avx_sources = []
+
     if Options.options.fpu_optimization:
         if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'):
-            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
+            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s', ]
+            avx_sources = [ 'sse_functions_avx_linux.cc' ]
         elif bld.env['build_target'] == 'x86_64':
-            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
+            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s', ]
+            avx_sources = [ 'sse_functions_avx_linux.cc' ]
         elif bld.env['build_target'] == 'mingw':
-                import platform as PLATFORM
-                u = PLATFORM.uname ()
-                cpu = u[4]
-                if re.search ("(x86_64|AMD64)", cpu) != None:
-                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit_win.s' ]
-
+	        # 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' ]
+                        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
+            avx_cxxflags = list(bld.env['CXXFLAGS'])
+            avx_cxxflags.append (bld.env['compiler_flags_dict']['avx'])
+            avx_cxxflags.append (bld.env['compiler_flags_dict']['pic'])
+            bld(features = 'cxx',
+                source   = avx_sources,
+                cxxflags = avx_cxxflags,
+                includes = [ '.' ],
+                use = [ 'libtimecode', 'libpbd', 'libevoral', ],
+                target   = 'sse_avx_functions')
+            
+            obj.use += ['sse_avx_functions' ]
+        
     # i18n
     if bld.is_defined('ENABLE_NLS'):
         mo_files = bld.path.ant_glob('po/*.mo')