remove more explicit compiler flags by placing them in the compiler flags dictionary

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 7b2ec9dbfb57a5c55a02c07034a3d38cffda59e2..fcd217cf07f763f7363b4a2d706bcda1bd8efd5e 100644 (file)
--- a/wscript
+++ b/wscript
@@ -8,8 +8,9 @@ import subprocess
 import sys
 import platform as PLATFORM
 from waflib.Tools import winres
-
+from waflib.Build import Context
 from waflib.Build import BuildContext
+
 class i18n(BuildContext):
         cmd = 'i18n'
         fun = 'i18n'
@@ -29,7 +30,7 @@ class i18n_mo(BuildContext):
 def is_tracks_build(self, *k, **kw):
        return self.env['PROGRAM_NAME'] == 'Tracks Live'
 
-BuildContext.is_tracks_build = is_tracks_build
+Context.Context.is_tracks_build = is_tracks_build
 
 compiler_flags_dictionaries= {
     'gcc' : {
@@ -77,6 +78,12 @@ compiler_flags_dictionaries= {
         'c99': '-std=c99',
         # Flag to enable AT&T assembler syntax
         'attasm': '-masm=att',
+        # Flags to make AVX instructions/intrinsics available
+        'avx': '-mavx',
+        # Flags to generate position independent code, when needed to build a shared object
+        'pic': '-fPIC',
+        # Flags required to compile C code with anonymous unions (only part of C11)
+        'c-anonymous-union': '-fms-extensions',
     },
     'msvc' : {
         'debuggable' : ['/DDEBUG', '/Od', '/Zi', '/MDd', '/Gd', '/EHsc'],
@@ -104,6 +111,10 @@ compiler_flags_dictionaries= {
         'cxx-strict' : '',
         'strict' : '',
         'c99': '/TP',
+        'attasm': '',
+        'avx': '',
+        'pic': '',
+        'c-anonymous-union': '',
     },
 }
 
@@ -295,8 +306,12 @@ int main() { return 0; }''',
         else:
             compiler_name = 'gcc'
 
-    flags_dict = compiler_flags_dictionaries[compiler_name]
-            
+    flags_dict = compiler_flags_dictionaries[compiler_name] 
+    # Save the compiler flags because we need them at build time
+    # when we need to add compiler specific flags in certain
+    # libraries
+    conf.env['compiler_flags_dict'] = flags_dict;
+    
     autowaf.set_basic_compiler_flags (conf,flags_dict)
     
     if conf.options.asan:
@@ -416,12 +431,12 @@ int main() { return 0; }''',
             if (re.search ("(x86_64|AMD64)", cpu) != None):
                 # on Windows sse is supported by 64 bit platforms only
                 build_host_supports_sse = True
-                
+
                 # 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_dict['attasm'] ])
-                
+
     # end of processor-specific section
 
     # optimization section
@@ -594,8 +609,6 @@ def options(opt):
     autowaf.set_options(opt, debug_by_default=True)
     opt.add_option('--program-name', type='string', action='store', default='Ardour', dest='program_name',
                     help='The user-visible name of the program being built')
-    opt.add_option ('--trx', action='store_true', default=False, dest='trx_build',
-                    help='Whether to build for TRX')
     opt.add_option('--arch', type='string', action='store', dest='arch',
                     help='Architecture-specific compiler FLAGS')
     opt.add_option('--with-backends', type='string', action='store', default='jack', dest='with_backends',
@@ -715,6 +728,7 @@ def configure(conf):
     conf.env['VERSION'] = VERSION
     conf.env['MAJOR'] = MAJOR
     conf.env['MINOR'] = MINOR
+    conf.env['MICRO'] = MICRO
     conf.line_just = 52
     autowaf.set_recursive()
     autowaf.configure(conf)
@@ -768,9 +782,6 @@ def configure(conf):
         conf.env.append_value ('CXXFLAGS', '-DSILENCE_AFTER')
         conf.define ('FREEBIE', 1)
 
-    if Options.options.trx_build:
-        conf.define ('TRX_BUILD', 1)
-
     if Options.options.lv2dir:
         conf.env['LV2DIR'] = Options.options.lv2dir
     else:
@@ -985,10 +996,16 @@ def configure(conf):
         autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True)
 
     backends = opts.with_backends.split(',')
+
     if not backends:
         print("Must configure and build at least one backend")
         sys.exit(1)
 
+    if conf.is_tracks_build():
+        # For Tracks, override backends on OS X or Windows    
+        if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc':
+            backends = [ 'wavesaudio' ]
+
     conf.env['BACKENDS'] = backends
     conf.env['BUILD_JACKBACKEND'] = any('jack' in b for b in backends)
     conf.env['BUILD_ALSABACKEND'] = any('alsa' in b for b in backends)
@@ -1012,7 +1029,6 @@ def configure(conf):
         print("ALSA Backend is only available on Linux")
         sys.exit(1)
 
-
     set_compiler_flags (conf, Options.options)
 
     if sys.platform == 'darwin':
@@ -1112,9 +1128,11 @@ def build(bld):
     # set up target directories
     lwrcase_dirname = 'ardour' + bld.env['MAJOR']
 
-    if bld.is_defined ('TRX_BUILD'):
-        lwrcase_dirname = 'trx'
-
+    if bld.is_tracks_build():
+       bld.env.append_value ('CXXFLAGS', '-DUSE_TRACKS_CODE_FEATURES')
+       bld.env.append_value ('CFLAGS', '-DUSE_TRACKS_CODE_FEATURES')
+       lwrcase_dirname = 'trx'
+        
     # configuration files go here
     bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname)
     # data files loaded at run time go here