From 6572b8d409adadb142b5b28c739f8edfa574661b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 4 May 2023 21:31:13 +0200 Subject: [PATCH] Fix cross-compile linking (libusb - see also 5794d21a769) --- gtk2_ardour/wscript | 4 ++++ headless/wscript | 3 +++ libs/fst/wscript | 5 +++++ luasession/wscript | 3 +++ session_utils/wscript | 3 +++ 5 files changed, 18 insertions(+) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 3b6fdde0b6..7becb0a614 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -577,6 +577,8 @@ def build(bld): obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' obj.source += [ 'luadoc.cc', 'bundle_env_linux.cc' ] obj.use += [ 'X11' ] + if bld.is_defined('HAVE_USB'): + obj.uselib += ' USB' if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] obj.use += [ 'SUIL' ] @@ -663,6 +665,8 @@ def build(bld): obj.linkflags = '' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' + if bld.is_defined('HAVE_USB'): + obj.uselib += ' USB' if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX ' obj.use += ' libappleutility' diff --git a/headless/wscript b/headless/wscript index 37ca9050f2..104bd5b4a6 100644 --- a/headless/wscript +++ b/headless/wscript @@ -56,6 +56,9 @@ def build(bld): if bld.is_defined('HAVE_SUIL'): obj.uselib += ' SUIL' + if bld.is_defined('HAVE_USB'): + obj.uselib += ' USB' + if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX' obj.use += ' libappleutility' diff --git a/libs/fst/wscript b/libs/fst/wscript index e814277b03..205f09a43e 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -43,6 +43,8 @@ def build(bld): obj.use = [ 'libpbd' ] obj.uselib = 'GIOMM DL UUID ARCHIVE CURL XML' + if bld.is_defined('HAVE_USB'): + obj.uselib += ' USB' if sys.platform == 'darwin': obj.uselib += ' OSX' if bld.env['build_target'] == 'mingw': @@ -68,6 +70,9 @@ def build(bld): obj.uselib = ['GIOMM', 'DL', 'OSX', 'ARCHIVE', 'CURL', 'XML' ] obj.use = [ 'libpbd', 'libtemporal', 'libevoral' ] + if bld.is_defined('HAVE_USB'): + obj.uselib += ['USB'] + obj.includes = [ '../pbd/', '../ardour/', '.' ] obj.defines = [ '_POSIX_SOURCE', diff --git a/luasession/wscript b/luasession/wscript index c02058af50..9a0454b1aa 100644 --- a/luasession/wscript +++ b/luasession/wscript @@ -68,6 +68,9 @@ def build(bld): if bld.is_defined('HAVE_SUIL'): obj.uselib += ' SUIL' + if bld.is_defined('HAVE_USB'): + obj.uselib += ' USB' + if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX' obj.use += ' libappleutility' diff --git a/session_utils/wscript b/session_utils/wscript index b5c7477c0c..5e9b441931 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -57,6 +57,9 @@ def build_ardour_util(bld, util): if bld.is_defined('HAVE_SUIL'): obj.uselib += ' SUIL' + if bld.is_defined('HAVE_USB'): + obj.uselib += ' USB' + if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX' obj.use += ' libappleutility'