X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=c274ef93bfa695617f2b20e94039d117909817ce;hb=ba418958bff3491a7565b67ce506ecb2052b7a39;hp=f019091a2da2a1e3bd3336bce7e35dea6fa62d01;hpb=cb617bb1c71d350d61a46506ff766166173c1dce;p=ardour.git

diff --git a/wscript b/wscript
index f019091a2d..c274ef93bf 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 # Variables for 'waf dist'
-VERSION = '3.0beta3'
+VERSION = '3.0beta4a'
 APPNAME = 'Ardour3'
 
 # Mandatory variables
@@ -35,6 +35,7 @@ children = [
         'templates',
         'export',
         'midi_maps',
+        'mcp',
         'manual'
 ]
 
@@ -127,10 +128,11 @@ def set_compiler_flags (conf,opt):
     platform = u[0].lower()
     version = u[2]
 
+    is_clang = conf.env['CXX'][0].endswith('clang++')
     if opt.gprofile:
         debug_flags = [ '-pg' ]
     else:
-        if platform != 'darwin':
+        if platform != 'darwin' and not is_clang:
             debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf!
 
     # Autodetect
@@ -213,7 +215,7 @@ def set_compiler_flags (conf,opt):
             elif cpu == "i686":
                 optimization_flags.append ("-march=i686")
 
-        if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
+        if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
             optimization_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
             debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
 
@@ -400,8 +402,8 @@ def options(opt):
                     help='Raise a floating point exception if a denormal is detected')
     opt.add_option('--test', action='store_true', default=False, dest='build_tests',
                     help="Build unit tests")
-    opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
-                    help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
+    #opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
+    # help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
     opt.add_option('--universal', action='store_true', default=False, dest='universal',
                     help='Compile as universal binary (OS X ONLY, requires that external libraries are universal)')
     opt.add_option('--generic', action='store_true', default=False, dest='generic',
@@ -588,8 +590,8 @@ def configure(conf):
         conf.env['ENABLE_NLS'] = True
     if opts.build_tests:
         conf.env['BUILD_TESTS'] = opts.build_tests
-    if opts.tranzport:
-        conf.env['TRANZPORT'] = 1
+    #if opts.tranzport:
+    #    conf.env['TRANZPORT'] = 1
     if opts.windows_vst:
         conf.define('WINDOWS_VST_SUPPORT', 1)
         conf.env['WINDOWS_VST_SUPPORT'] = True
@@ -667,7 +669,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Samplerate',            conf.is_defined('HAVE_SAMPLERATE'))
 #    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
     write_config_text('Translation',           opts.nls)
-    write_config_text('Tranzport',             opts.tranzport)
+#    write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.env['BUILD_TESTS'])
     write_config_text('Universal binary',      opts.universal)
     write_config_text('Generic x86 CPU',       opts.generic)
@@ -737,11 +739,3 @@ def i18n_po(bld):
 def i18n_mo(bld):
     bld.recurse (i18n_children)
 
-def install_not_supported(bld):
-    print ('Installing Ardour 3 is currently unsupported. Run it via the command ./ardev from within the gtk2_ardour directory.')
-    sys.exit (1)
-
-from waflib import Build
-class install(Build.InstallContext):
-    cmd = 'install'
-    fun = 'install_not_supported'