merge with master, fixing conflicts in 3 wscript files

2013-10-09 14:00:42 -04:00
parent 66aa6dfc8e 465b800d8b
commit 2a6a16f980
64 changed files with 4195 additions and 3528 deletions
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -37,10 +37,10 @@ def build(bld):
            'jack_connection.cc',
            'jack_audiobackend.cc',
            'jack_portengine.cc',
-            'jack_utils.cc'
+            'jack_utils.cc',
+            'jack_session.cc',
            ]
    obj.includes = ['.']
-    obj.cxxflags = [ '-fPIC' ]
    obj.name     = 'jack_audiobackend'
    obj.target   = 'jack_audiobackend'
    if Options.options.dist_target == 'mingw':