X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=62aa88ed975c7e15a7350bb6b6e54fc8ea348959;hb=98dfa5322872465f6c2634157df8ffcd83ac9a32;hp=4635eaf390d18c7ad12fa96a8413e6bc8e0b97b2;hpb=6b61d58b8a00b23c56cd685532f7c3e54ed8c25c;p=ardour.git

diff --git a/wscript b/wscript
index 4635eaf390..62aa88ed97 100644
--- a/wscript
+++ b/wscript
@@ -203,6 +203,7 @@ children = [
         'libs/qm-dsp',
         'libs/vamp-plugins',
         'libs/libltc',
+        'libs/lua',
         'libs/ptformat',
         # core ardour libraries
         'libs/pbd',
@@ -222,6 +223,7 @@ children = [
         'midi_maps',
         'mcp',
         'patchfiles',
+        'scripts',
         'headless',
         'session_utils',
         # shared helper binaries (plugin-scanner, exec-wrapper)
@@ -229,6 +231,7 @@ children = [
         'libs/vfork',
         'libs/ardouralsautil',
         'cfgtool',
+        'tools/luadevel',
 ]
 
 i18n_children = [
@@ -390,7 +393,7 @@ int main() { return 0; }''',
         #
         compiler_flags.append ('-U__STRICT_ANSI__')
 
-    if opt.use_libcpp:
+    if opt.use_libcpp or conf.env['build_host'] in [ 'el_capitan' ]:
        cxx_flags.append('--stdlib=libc++')
        linker_flags.append('--stdlib=libc++')
 
@@ -402,7 +405,7 @@ int main() { return 0; }''',
             # from requiring a full path to requiring just the header name.
             cxx_flags.append('-DCARBON_FLAT_HEADERS')
 
-            if not opt.use_libcpp:
+            if not opt.use_libcpp and not conf.env['build_host'] in [ 'el_capitan' ]:
                 cxx_flags.append('--stdlib=libstdc++')
                 linker_flags.append('--stdlib=libstdc++')
             # Prevents visibility issues in standard headers
@@ -741,6 +744,8 @@ def options(opt):
                     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')
+    opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews',
+                    help='Disable threaded waveview rendering')
 
     for i in children:
         opt.recurse(i)
@@ -844,9 +849,7 @@ def configure(conf):
         conf.define ('HAVE_COREAUDIO', 1)
         conf.define ('AUDIOUNIT_SUPPORT', 1)
 
-        conf.define ('GTKOSX', 1)
         conf.define ('TOP_MENUBAR',1)
-        conf.define ('GTKOSX',1)
 
         # It would be nice to be able to use this to force back-compatibility with 10.4
         # but even by the time of 11, the 10.4 SDK is no longer available in any normal
@@ -1079,7 +1082,10 @@ int main () { return 0; }
     if opts.ptformat:
         conf.define('PTFORMAT', 1)
         conf.env['PTFORMAT'] = True
-
+    if opts.no_threaded_waveviews:
+        conf.define('NO_THREADED_WAVEVIEWS', 1)
+        conf.env['NO_THREADED_WAVEVIEWS'] = True
+        
     backends = opts.with_backends.split(',')
 
     if not backends: