summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2020-01-21 04:35:40 +0100
committerRobin Gareus <robin@gareus.org>2020-01-25 04:07:41 +0100
commit06b2eb1c277c35e653b9117b194eadbb65dcbb66 (patch)
treee2a1903dc45fbc9724cb18dc3c69f6e714d79ac9 /libs/surfaces
parent1d2cfd6f2d736144b8c81179126b5850a718f769 (diff)
Explicitly use OSX
Previously this was inherited via PBD. On MacOS/X, this adds "-undefined dynamic_lookup -flat_namespace" and various "-framework .." options to linkflags Without this flag, .dylibs fail to link usually because of missing `-lintl` (Undefined symbols: "_libintl_dgettext") On other systems this is a NO-OP: CFLAGS_OSX, CXXFLAGS_OSX and LINKFLAGS_OSX are only set on the darwin platform.
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/cc121/wscript2
-rw-r--r--libs/surfaces/contourdesign/wscript2
-rw-r--r--libs/surfaces/control_protocol/wscript2
-rw-r--r--libs/surfaces/faderport/wscript2
-rw-r--r--libs/surfaces/faderport8/wscript6
-rw-r--r--libs/surfaces/frontier/wscript1
-rw-r--r--libs/surfaces/generic_midi/wscript2
-rw-r--r--libs/surfaces/launch_control_xl/wscript2
-rw-r--r--libs/surfaces/mackie/wscript2
-rw-r--r--libs/surfaces/maschine2/wscript2
-rw-r--r--libs/surfaces/osc/wscript2
-rw-r--r--libs/surfaces/push2/wscript2
-rw-r--r--libs/surfaces/tranzport/wscript1
-rw-r--r--libs/surfaces/us2400/wscript2
14 files changed, 16 insertions, 14 deletions
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')