Merge branch 'master' into windows

[ardour.git] / wscript

diff --git a/wscript b/wscript
index dbb465a41367834caab96f881f00b868c91bd484..559f99d9e39cab8b9d0282f3ba980b29f3b5e02b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 MAJOR = '3'
-MINOR = '3'
+MINOR = '4'
 VERSION = MAJOR + '.' + MINOR
 
 APPNAME = 'Ardour' + MAJOR
@@ -29,6 +29,7 @@ children = [
         'libs/rubberband',
         'libs/surfaces',
         'libs/panners',
+        'libs/backends',
         'libs/timecode',
         'libs/ardour',
         'libs/gtkmm2ext',
@@ -120,8 +121,9 @@ def set_compiler_flags (conf,opt):
         debug_flags = [ '-pg' ]
 
     if opt.backtrace:
-        if platform != 'darwin' and not is_clang:
-            debug_flags = [ '-rdynamic' ]
+        if opt.dist_target == 'auto':
+            if platform != 'darwin' and not is_clang:
+                debug_flags = [ '-rdynamic' ]
 
     # Autodetect
     if opt.dist_target == 'auto':