X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fbackends%2Fjack%2Fwscript;h=bd5735f05a20ec085f12dfbd3c524cdd8354480f;hb=c2652437da8786e1a1803486fddf131f20af98d3;hp=09a7c227f728b9177aeb1badad97032e8f03f346;hpb=997f47360d35dad3347861e389166149cbd6a5f0;p=ardour.git

diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 09a7c227f7..bd5735f05a 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -49,7 +49,7 @@ def configure(conf):
                    uselib = 'JACK')
 
     # Check to see if jack_port_rename() is available and working
-    if Options.options.libjack_link == 'link':
+    if conf.env['libjack_link'] == 'link':
             conf.check_cxx(fragment = "#include <jack/jack.h>\nint main(void) { jack_client_t* c; jack_port_t* p; jack_port_rename (c, p, \"foo\"); return 0; }\n",
                    mandatory = False,
                    execute = False,
@@ -62,7 +62,7 @@ def configure(conf):
 
 def build(bld):
     obj = bld(features = 'c cxx cxxshlib')
-    obj.source = [ 
+    obj.source = [
             'jack_api.cc',
             'jack_connection.cc',
             'jack_audiobackend.cc',
@@ -74,14 +74,14 @@ def build(bld):
     obj.includes = ['.']
     obj.name     = 'jack_audiobackend'
     obj.target   = 'jack_audiobackend'
-    obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 
+    obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS'
                    ]
     obj.use      = 'libardour libpbd ardouralsautil'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     if bld.env['build_target'] != 'mingw':
-        obj.cxxflags = [ '-fPIC' ]
-        obj.cflags   = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
     else:
         obj.cxxflags = [ ]
         obj.cflags   = [ ]
@@ -101,14 +101,19 @@ def build(bld):
 
     if bld.env['libjack_link'] == 'link':
         obj.uselib   += [ 'JACK' ]
+    elif bld.env['build_target'] == 'mingw':
+        obj.defines += [ 'USE_WEAK_JACK' ]
+        obj.deps = [ 'weak_libjack.def' ]
     else:
         obj.defines += [ 'USE_WEAK_JACK', 'HAVE_JACK_PORT_RENAME' ]
         obj.deps = [ 'weak_libjack.def' ]
 
+    obj.uselib   += [ 'GLIBMM', 'XML' ];
+
     #
     # device discovery code in the jack backend needs ALSA
     # on Linux.
-    # 
+    #
 
     if re.search ("linux", sys.platform) != None:
        obj.uselib += [ 'ALSA' ]