Remove previous fix attempt at restoring state for backends with driver selection

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 79f9209526b687d5f4f5b27a073b84db03861152..bcffc419b8612cf3bbd6e0d24537012f145c066e 100644 (file)
--- a/wscript
+++ b/wscript
@@ -28,7 +28,7 @@ class i18n_mo(BuildContext):
         fun = 'i18n_mo'
 
 def is_tracks_build(self, *k, **kw):
-       return self.env['PROGRAM_NAME'] == 'Tracks Live'
+        return self.env['PROGRAM_NAME'] == 'Tracks Live'
 
 Context.Context.is_tracks_build = is_tracks_build
 
@@ -82,6 +82,8 @@ compiler_flags_dictionaries= {
         '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'],
@@ -112,6 +114,7 @@ compiler_flags_dictionaries= {
         'attasm': '',
         'avx': '',
         'pic': '',
+        'c-anonymous-union': '',
     },
 }
 
@@ -176,8 +179,12 @@ else:
     MICRO = '0'
 
 V = MAJOR + '.' + MINOR + '.' + MICRO
-VERSION = V
-PROGRAM_VERSION = MAJOR
+# Ensure that these are not unicode, which
+# can cause odd problems elsewhere. Note that
+# in python3, encode and decode do not return
+# strings, so we have to force the type.
+VERSION = str (V.encode ('ascii', 'ignore'))
+PROGRAM_VERSION = str (MAJOR.encode ('ascii', 'ignore'))
 
 # Mandatory variables
 top = '.'
@@ -188,6 +195,7 @@ children = [
         'libs/qm-dsp',
         'libs/vamp-plugins',
         'libs/libltc',
+        'libs/ptformat',
         # core ardour libraries
         'libs/pbd',
         'libs/midi++2',
@@ -442,13 +450,13 @@ int main() { return 0; }''',
             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':
-               compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+                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")
+                # 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)")
 
@@ -594,7 +602,7 @@ int main() { return 0; }''',
     conf.env.append_value('LINKFLAGS', linker_flags)
 
 def is_tracks_build (conf):
-       return conf.env['PROGRAM_NAME'] == 'Tracks Live'
+        return conf.env['PROGRAM_NAME'] == 'Tracks Live'
     
 #----------------------------------------------------------------
 
@@ -699,6 +707,9 @@ def options(opt):
                     help='Turn on c++11 compiler flags (-std=c++11)')
     opt.add_option('--address-sanitizer', action='store_true', default=False, dest='asan',
                     help='Turn on AddressSanitizer (requires GCC >= 4.8 or clang >= 3.1)')
+    opt.add_option('--ptformat', action='store_true', default=False, dest='ptformat',
+                    help='Turn on PT session import option')
+
     for i in children:
         opt.recurse(i)
 
@@ -991,6 +1002,9 @@ def configure(conf):
         conf.env['DEBUG_DENORMAL_EXCEPTION'] = True
     if opts.build_tests:
         autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True)
+    if opts.ptformat:
+        conf.define('PTFORMAT', 1)
+        conf.env['PTFORMAT'] = True
 
     backends = opts.with_backends.split(',')
 
@@ -1089,6 +1103,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Phone home',            conf.is_defined('PHONE_HOME'))
     write_config_text('Program name',          opts.program_name)
     write_config_text('Samplerate',            conf.is_defined('HAVE_SAMPLERATE'))
+    write_config_text('PT format',            conf.is_defined('PTFORMAT'))
 #    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
     write_config_text('Translation',           opts.nls)
 #    write_config_text('Tranzport',             opts.tranzport)
@@ -1126,9 +1141,9 @@ def build(bld):
     lwrcase_dirname = 'ardour' + bld.env['MAJOR']
 
     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'
+        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)