diff options
26 files changed, 28 insertions, 25 deletions
diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript index 8dc0300b3b..941ede0e47 100644 --- a/libs/backends/coreaudio/wscript +++ b/libs/backends/coreaudio/wscript @@ -29,7 +29,7 @@ def build(bld): obj.name = 'coreaudio_backend' obj.target = 'coreaudio_backend' obj.use = 'libardour libpbd' - obj.uselib = 'GLIBMM XML' + obj.uselib = 'GLIBMM XML OSX' obj.framework = [ 'CoreAudio', 'AudioToolbox', 'CoreServices' ] if bld.env['build_target'] not in [ 'lion', 'el_capitan' ] and (not bld.env['build_arch'] == "ppc"): obj.framework += [ 'CoreMidi' ] diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript index 0cbe31109e..139f65c870 100644 --- a/libs/backends/dummy/wscript +++ b/libs/backends/dummy/wscript @@ -25,7 +25,7 @@ def build(bld): obj.name = 'dummy_audiobackend' obj.target = 'dummy_audiobackend' obj.use = 'libardour libpbd libltc' - obj.uselib = 'GLIBMM XML' + obj.uselib = 'GLIBMM XML OSX' obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 'ARDOURBACKEND_DLL_EXPORTS' diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript index 44242d1c41..88dad383d2 100644 --- a/libs/backends/jack/wscript +++ b/libs/backends/jack/wscript @@ -108,7 +108,7 @@ def build(bld): obj.defines += [ 'USE_WEAK_JACK', 'HAVE_JACK_PORT_RENAME' ] obj.deps = [ 'weak_libjack.def' ] - obj.uselib += [ 'GLIBMM', 'XML' ]; + obj.uselib += [ 'GLIBMM', 'XML', 'OSX']; # # device discovery code in the jack backend needs ALSA diff --git a/libs/canvas/wscript b/libs/canvas/wscript index 22d0a0fd5f..bfe6e8e08e 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -86,7 +86,7 @@ def build(bld): obj.export_includes = ['.'] obj.includes = ['.'] - obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST XML' + obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST XML OSX' obj.use = [ 'libpbd', 'libgtkmm2ext' ] obj.name = 'libcanvas' obj.target = 'canvas' diff --git a/libs/evoral/wscript b/libs/evoral/wscript index cc02c56823..154dbc5b42 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -114,7 +114,7 @@ def build(bld): obj.includes = ['.', './src'] obj.name = 'libevoral' obj.target = 'evoral' - obj.uselib = 'GLIBMM GTHREAD SMF XML LIBPBD' + obj.uselib = 'GLIBMM GTHREAD SMF XML LIBPBD OSX' obj.use = 'libsmf libpbd' obj.vnum = EVORAL_LIB_VERSION obj.install_path = bld.env['LIBDIR'] diff --git a/libs/fst/wscript b/libs/fst/wscript index 0bcd341980..64b7bb5d5b 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -77,7 +77,7 @@ def build(bld): obj.linkflags = ['-mwindows'] obj.use = [ 'libpbd', 'vstwin' ] else: - obj.uselib = ['GIOMM', 'DL'] + obj.uselib = ['GIOMM', 'DL', 'OSX'] obj.use = [ 'libpbd' ] obj.includes = [ '../pbd/', '../ardour/', '.' ] diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 7a64ea01d3..b6dbaa63ec 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -94,6 +94,7 @@ def build(bld): os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] if sys.platform == 'darwin': obj.source += ['gtkapplication_quartz.mm', 'nsglview.mm'] + obj.uselib += ' OSX' else: obj.source += ['gtkapplication_x11.c'] diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript index b28c95df78..d415c045a2 100644 --- a/libs/panners/1in2out/wscript +++ b/libs/panners/1in2out/wscript @@ -22,7 +22,7 @@ def build(bld): obj.name = 'libardour_pan1in2out' obj.target = 'pan1in2out' obj.use = 'libardour libardour_cp libpbd' - obj.uselib = 'GLIBMM XML' + obj.uselib = 'GLIBMM XML OSX' obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript index f49f1cde2a..ef3e6c8469 100644 --- a/libs/panners/2in2out/wscript +++ b/libs/panners/2in2out/wscript @@ -22,7 +22,7 @@ def build(bld): obj.name = 'libardour_pan2in2out' obj.target = 'pan2in2out' obj.use = 'libardour libardour_cp libpbd' - obj.uselib = 'GLIBMM XML' + obj.uselib = 'GLIBMM XML OSX' obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript index 16d69d907b..e29abfbd97 100644 --- a/libs/panners/stereobalance/wscript +++ b/libs/panners/stereobalance/wscript @@ -22,7 +22,7 @@ def build(bld): obj.name = 'libardour_panbalance' obj.target = 'panbalance' obj.use = 'libardour libardour_cp libpbd' - obj.uselib = 'GLIBMM XML' + obj.uselib = 'GLIBMM XML OSX' obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript index d8f47b2a40..6843112c94 100644 --- a/libs/panners/vbap/wscript +++ b/libs/panners/vbap/wscript @@ -22,7 +22,7 @@ def build(bld): obj.name = 'libardour_panvbap' obj.target = 'panvbap' obj.use = 'libardour libardour_cp libpbd' - obj.uselib = 'GLIBMM XML' + obj.uselib = 'GLIBMM XML OSX' obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/surfaces/cc121/wscript b/libs/surfaces/cc121/wscript index 478834aa3a..8195bb53a6 100644 --- a/libs/surfaces/cc121/wscript +++ b/libs/surfaces/cc121/wscript @@ -26,7 +26,7 @@ def build(bld): obj.includes = [ '.', './cc121'] obj.name = 'libardour_cc121' obj.target = 'ardour_cc121' - obj.uselib = 'GTKMM GTK GDK XML' + obj.uselib = 'GTKMM GTK GDK XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript index 4f070028e2..1f40dc4886 100644 --- a/libs/surfaces/contourdesign/wscript +++ b/libs/surfaces/contourdesign/wscript @@ -27,7 +27,7 @@ def build(bld): obj.includes = ['.', '../libs', '../../widgets'] obj.name = 'libardour_contourdesign' obj.target = 'ardour_contourdesign' - obj.uselib = 'GTKMM USB XML' + obj.uselib = 'GTKMM USB XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index e56e4dc28b..76dda1118e 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -33,7 +33,7 @@ def build(bld): obj.name = 'libardour_cp' obj.target = 'ardourcp' obj.use = 'libardour libpbd' - obj.uselib = 'GLIBMM SIGCPP XML' + obj.uselib = 'GLIBMM SIGCPP XML OSX' obj.install_path = bld.env['LIBDIR'] def shutdown(): diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript index b13796d793..f72a115e43 100644 --- a/libs/surfaces/faderport/wscript +++ b/libs/surfaces/faderport/wscript @@ -26,7 +26,7 @@ def build(bld): obj.includes = [ '.', './faderport'] obj.name = 'libardour_faderport' obj.target = 'ardour_faderport' - obj.uselib = 'GTKMM GTK GDK XML' + obj.uselib = 'GTKMM GTK GDK XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/faderport8/wscript b/libs/surfaces/faderport8/wscript index 4485e5d0e4..07e1eb381e 100644 --- a/libs/surfaces/faderport8/wscript +++ b/libs/surfaces/faderport8/wscript @@ -30,7 +30,7 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_faderport8' obj.target = 'ardour_faderport8' - obj.uselib = 'GTKMM GTK GDK XML' + obj.uselib = 'GTKMM GTK GDK XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') @@ -43,7 +43,7 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_faderport16' obj.target = 'ardour_faderport16' - obj.uselib = 'GTKMM GTK GDK XML' + obj.uselib = 'GTKMM GTK GDK XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') @@ -56,7 +56,7 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_faderport2' obj.target = 'ardour_faderport2' - obj.uselib = 'GTKMM GTK GDK XML' + obj.uselib = 'GTKMM GTK GDK XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index db9ffe76d1..c8613c0ba3 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -26,6 +26,7 @@ def build(bld): obj.includes = ['.', './generic_midi'] obj.name = 'libgeneric_midi' obj.target = 'generic_midi' + obj.uselib = 'XML OSX' obj.use = 'libardour libardourcp' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 167e1dd03b..73e55c3fa4 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -29,7 +29,7 @@ def build(bld): obj.includes = [ '.', './generic_midi'] obj.name = 'libardour_generic_midi' obj.target = 'ardour_generic_midi' - obj.uselib = 'GTKMM GTK GDK XML' + obj.uselib = 'GTKMM GTK GDK XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/launch_control_xl/wscript b/libs/surfaces/launch_control_xl/wscript index 97f4f2222c..e573101331 100644 --- a/libs/surfaces/launch_control_xl/wscript +++ b/libs/surfaces/launch_control_xl/wscript @@ -33,7 +33,7 @@ def build(bld): obj.includes = ['.', './launch_control_xl'] obj.name = 'libardour_launch_control_xl' obj.target = 'ardour_launch_control_xl' - obj.uselib = 'GTKMM SIGCPP XML' + obj.uselib = 'GTKMM SIGCPP XML OSX' obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index b797b4a0b4..fa18995999 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -41,7 +41,7 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_mcp' obj.target = 'ardour_mcp' - obj.uselib = 'GTKMM XML' + obj.uselib = 'GTKMM XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/maschine2/wscript b/libs/surfaces/maschine2/wscript index aa8cb8a7fa..5b6dc97723 100644 --- a/libs/surfaces/maschine2/wscript +++ b/libs/surfaces/maschine2/wscript @@ -37,7 +37,7 @@ def build(bld): obj.includes = [ '.', './maschine2'] obj.name = 'libardour_maschine2' obj.target = 'ardour_maschine2' - obj.uselib = 'CAIROMM PANGOMM' + obj.uselib = 'CAIROMM PANGOMM OSX' obj.use = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index 5bbe7d3946..447979a27d 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -30,7 +30,7 @@ def build(bld): obj.includes = ['.', './osc'] obj.name = 'libardour_osc' obj.target = 'ardour_osc' - obj.uselib = 'LO GTKMM GTK GDK XML' + obj.uselib = 'LO GTKMM GTK GDK XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/push2/wscript b/libs/surfaces/push2/wscript index a025e12d59..b595b1702b 100644 --- a/libs/surfaces/push2/wscript +++ b/libs/surfaces/push2/wscript @@ -42,7 +42,7 @@ def build(bld): obj.includes = ['.', './push2'] obj.name = 'libardour_push2' obj.target = 'ardour_push2' - obj.uselib = 'CAIROMM PANGOMM USB GTKMM SIGCPP XML' + obj.uselib = 'CAIROMM PANGOMM USB GTKMM SIGCPP XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libevoral libcanvas libtemporal' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index 21711149d7..1af293ce93 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -38,6 +38,7 @@ def build(bld): obj.includes = ['.', './tranzport'] obj.name = 'libardour_tranzport' obj.target = 'ardour_tranzport' + obj.uselib = 'XML OSX' obj.use = 'libardour libardour_cp' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/us2400/wscript b/libs/surfaces/us2400/wscript index 7a7d7751da..f8bddf8d58 100644 --- a/libs/surfaces/us2400/wscript +++ b/libs/surfaces/us2400/wscript @@ -41,7 +41,7 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_us2400' obj.target = 'ardour_us2400' - obj.uselib = 'GTKMM XML' + obj.uselib = 'GTKMM XML OSX' obj.use = 'libardour libardour_cp libgtkmm2ext' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/widgets/wscript b/libs/widgets/wscript index d1b4aab0ac..8c052f5bed 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -75,7 +75,7 @@ def build(bld): obj.export_includes = ['.'] obj.includes = ['.'] + bld.env['INCLUDES_GLIB'] - obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST XML' + obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST XML OSX' obj.use = [ 'libpbd', 'libgtkmm2ext' ] obj.name = 'libwidgets' obj.target = 'widgets' |