Fix deadlock when removing routes (initialization issues)

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 6bdef92f639810011e5c1ed07a7bc5bb76f88555..40ce25b29050ea1c699e27824e5a6d1aa9cfa0b4 100644 (file)
--- a/wscript
+++ b/wscript
@@ -236,6 +236,7 @@ children = [
         'libs/qm-dsp',
         'libs/vamp-plugins',
         'libs/zita-resampler',
+        'libs/zita-convolver',
         # core ardour libraries
         'libs/pbd',
         'libs/midi++2',
@@ -670,11 +671,12 @@ int main() { return 0; }''',
          '-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG'))
 
     # use sparingly, prefer runtime profile
-    if Options.options.program_name.lower() == "mixbus":
+    if Options.options.program_name.lower().startswith('mixbus'):
         compiler_flags.append ('-DMIXBUS')
+        conf.define('MIXBUS', 1)
 
     if Options.options.program_name.lower() == "mixbus32c":
-        compiler_flags.append ('-DMIXBUS')
+        conf.define('MIXBUS32C', 1)
         compiler_flags.append ('-DMIXBUS32C')
 
     compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"')
@@ -766,10 +768,6 @@ def options(opt):
                     help='Compile libcanvas test GUI')
     opt.add_option('--beatbox', action='store_true', default=False, dest='beatbox',
                     help='Compile beatbox test app')
-    opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
-                    help='Compile with support for LV2 (if Lilv+Suil is available)')
-    opt.add_option('--no-lv2', action='store_false', dest='lv2',
-                    help='Do not compile with support for LV2')
     opt.add_option('--lv2dir', type='string', help="install destination for builtin LV2 bundles [Default: LIBDIR/lv2]")
     opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst',
                     help='Compile with support for linuxVST plugins')
@@ -1094,6 +1092,9 @@ int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; }
         conf.check_cc(function_name='htonl', header_name='winsock2.h', lib='ws2_32')
         conf.env.append_value('LIB', 'ws2_32')
         conf.env.append_value('LIB', 'winmm')
+        if Options.options.program_name.lower().startswith('mixbus'):
+            conf.env.append_value('LIB', 'ole32')
+            conf.env.append_value('LIB', 'uuid')
         # needed for mingw64 packages, not harmful on normal mingw build
         conf.env.append_value('LIB', 'intl')
         conf.check_cc(function_name='regcomp', header_name='regex.h',