enable trim on master bus

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 61e2abd4d1a4c1a7a0b8f11c0933324b4ddfbb7a..6005f88d36cc28e335736259dc7736caa6d72620 100644 (file)
--- a/wscript
+++ b/wscript
@@ -72,7 +72,7 @@ compiler_flags_dictionaries= {
         # Flag to turn on C99 compliance by itself 
         'c99': '-std=c99',
        # Flag to enable AT&T assembler syntax
-       'attasm': 'asm=att',
+       'attasm': '-masm=att',
     },
     'msvc' : {
         'debuggable' : ['/DDEBUG', '/Od', '/Zi', '/MDd', '/Gd', '/EHsc'],
@@ -416,7 +416,7 @@ int main() { return 0; }''',
                 # mingw GCC compiler to uses at&t (Unix specific) assembler dialect by default
                 # compiler_flags.append (["--mmnemonic=att", "msyntax=att")
                 
-                compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'], flags_dicts['attasm'] ])
+                compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'], flags_dict['attasm'] ])
                 
     # end of processor-specific section
 
@@ -425,8 +425,14 @@ int main() { return 0; }''',
         if sys.platform == 'darwin':
             compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS");
             conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate'])
-        elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64' or (conf.env['build_target'] == 'mingw' and build_host_supports_sse):
-            compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+        elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64':
+               compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+        elif conf.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(conf.env['CC'])):
+                       compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
         if not build_host_supports_sse:
             print("\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)")
 
@@ -609,8 +615,6 @@ def options(opt):
                     help='Compile for use with gprofile')
     opt.add_option('--libjack', type='string', default="auto", dest='libjack_link',
                     help='libjack link mode  [auto|link|weak]')
-    opt.add_option('--no-jack-metadata', action='store_false', default=True, dest='libjack_meta',
-                    help='disable support for jack metadata')
     opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs',
                    help='Build internal libs as shared libraries')
     opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs',
@@ -1053,7 +1057,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Freedesktop files',     opts.freedesktop)
     write_config_text('JACK Backend',          conf.env['BUILD_JACKBACKEND'])
     write_config_text('Libjack linking',       conf.env['libjack_link'])
-    write_config_text('Libjack metadata',      not conf.is_defined('NO_JACK_METADATA'))
+    write_config_text('Libjack metadata',      conf.is_defined ('HAVE_JACK_METADATA'))
     write_config_text('LV2 UI embedding',      conf.is_defined('HAVE_SUIL'))
     write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))
     write_config_text('LXVST support',         conf.is_defined('LXVST_SUPPORT'))