From 99c1f50a72d513ba9e7f678401d51e8bb0f8912e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 6 Jul 2025 15:15:59 +0200 Subject: [PATCH] Really remove gtk+ option (see also 1e28ee9cc98) After patching gtk/ytk to add touch support and macOS rendering, upstream gtk+2 is no longer an option --- gtk2_ardour/wscript | 28 +++++++------------------ headless/wscript | 5 +---- libs/ardour/wscript | 5 +---- libs/canvas/wscript | 10 ++------- libs/clearlooks-newer/wscript | 7 ++----- libs/gtkmm2ext/wscript | 13 +++--------- libs/surfaces/cc121/wscript | 9 ++------ libs/surfaces/console1/wscript | 9 ++------ libs/surfaces/contourdesign/wscript | 9 ++------ libs/surfaces/faderport/wscript | 9 ++------ libs/surfaces/faderport8/wscript | 27 ++++++------------------ libs/surfaces/generic_midi/wscript | 9 ++------ libs/surfaces/launch_control_xl/wscript | 9 ++------ libs/surfaces/launchkey_4/wscript | 18 ++++------------ libs/surfaces/launchpad_pro/wscript | 9 ++------ libs/surfaces/launchpad_x/wscript | 18 ++++------------ libs/surfaces/mackie/wscript | 18 ++++------------ libs/surfaces/maschine2/wscript | 9 ++------ libs/surfaces/osc/wscript | 9 ++------ libs/surfaces/push2/wscript | 9 ++------ libs/surfaces/us2400/wscript | 9 ++------ libs/surfaces/wiimote/wscript | 9 ++------ libs/waveview/wscript | 10 ++------- libs/widgets/wscript | 9 ++------ luasession/wscript | 5 +---- session_utils/wscript | 7 +------ 26 files changed, 64 insertions(+), 224 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index cc71e41da4..68d519f9aa 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -487,10 +487,6 @@ def configure(conf): autowaf.check_pkg(conf, 'pangoft2', uselib_store='PANGOFT2', atleast_version='1.36.8', mandatory=False) autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') - if not conf.is_defined('YTK'): - autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18') - autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18', mandatory=True) - if conf.env.CC_NAME == 'gcc' and Options.options.strict: conf.define('GLIB_DISABLE_DEPRECATION_WARNINGS', 1) for var in ['CFLAGS', 'CXXFLAGS']: @@ -555,12 +551,9 @@ def build(bld): obj.linkflags = '' obj.uselib = 'UUID FLAC FONTCONFIG GTHREAD GTK OGG PANGOMM CURL DL 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('YTK'): - obj.use += [ 'libytk', 'libytkmm' ] - obj.uselib += ' GLIBMM GIOMM PANGOMM PANGOFT2 LIBPNG' - else: - obj.uselib += ' GTKMM' + obj.use += [ 'X11' ] + obj.use += [ 'libytk', 'libytkmm' ] + obj.uselib += ' GLIBMM GIOMM PANGOMM PANGOFT2 LIBPNG' if False and bld.is_defined('USE_EXTERNAL_LIBS'): obj.uselib += ' LIBAAF' @@ -571,10 +564,7 @@ def build(bld): obj.uselib += ' USB' if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] - if bld.is_defined('YTK'): - obj.use += [ 'libsuil' ] - else: - obj.uselib += ' SUIL' + obj.use += [ 'libsuil' ] if bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'vst_plugin_ui.cc' ] obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] @@ -646,6 +636,8 @@ def build(bld): 'libwaveview', 'libwidgets', 'libptformat', + 'libytk', + 'libytkmm', ] obj.defines = [ @@ -656,13 +648,7 @@ def build(bld): ] obj.install_path = bld.env['DLLDIR'] obj.linkflags = bld.env['compiler_flags_dict']['execstack'] - obj.uselib = 'UUID FLAC FONTCONFIG GTHREAD OGG PANGOMM CURL DL CANVAS FFTW3F LO TAGLIB XML LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' - - if bld.is_defined('YTK'): - obj.use += [ 'libytk', 'libytkmm' ] - obj.uselib += ' GLIBMM GIOMM PANGOFT2 LIBPNG' - else: - obj.uselib += ' GTKMM GTK' + obj.uselib = 'UUID FLAC FONTCONFIG GTHREAD OGG PANGOMM CURL DL CANVAS FFTW3F LO TAGLIB XML LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK GLIBMM GIOMM PANGOFT2 LIBPNG' if False and bld.is_defined('USE_EXTERNAL_LIBS'): obj.uselib += ' LIBAAF' diff --git a/headless/wscript b/headless/wscript index aa83040fac..ee107e308c 100644 --- a/headless/wscript +++ b/headless/wscript @@ -41,10 +41,7 @@ def build(bld): obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' if bld.is_defined('HAVE_SUIL'): - if bld.is_defined('YTK'): - obj.use += [ 'libsuil' ] - else: - obj.uselib += ' SUIL' + obj.use += [ 'libsuil' ] if bld.is_defined('HAVE_USB'): obj.uselib += ' USB' diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 5f3604cc98..a7cdc52db6 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -438,10 +438,7 @@ def build(bld): obj.source += ['lv2_plugin.cc', 'lv2_evbuf.cc', 'uri_map.cc'] obj.uselib += ['LILV'] if bld.is_defined('HAVE_SUIL'): - if bld.is_defined('YTK'): - obj.use += [ 'libsuil' ] - else: - obj.uselib += ['SUIL'] + obj.use += [ 'libsuil' ] if bld.is_defined('WINDOWS_VST_SUPPORT'): obj.source += [ 'windows_vst_plugin.cc'] diff --git a/libs/canvas/wscript b/libs/canvas/wscript index 4d6e13a3ad..c660649240 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -78,20 +78,14 @@ def build(bld): obj.export_includes = ['.'] obj.includes = ['.'] - obj.uselib = 'SIGCPP CAIROMM PANGOMM BOOST XML OSX' - obj.use = [ 'libpbd', 'libgtkmm2ext' ] + obj.uselib = 'SIGCPP CAIROMM PANGOMM BOOST XML OSX LIBMM GIOMM' + obj.use = [ 'libpbd', 'libgtkmm2ext', 'libytkmm' ] obj.name = 'libcanvas' obj.target = 'canvas' obj.vnum = CANVAS_LIB_VERSION obj.install_path = bld.env['LIBDIR'] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] - if bld.is_defined('YTK'): - obj.use += [ 'libytkmm' ] - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' - # canvas unit-tests are outdated if False and bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): unit_testobj = bld(features = 'cxx cxxprogram') diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript index 8b74c30453..ca4f5eb90e 100644 --- a/libs/clearlooks-newer/wscript +++ b/libs/clearlooks-newer/wscript @@ -28,11 +28,8 @@ def build(bld): obj.install_path = os.path.join(bld.env['LIBDIR'], 'engines') autowaf.ensure_visible_symbols (obj, True) - if bld.is_defined('YTK'): - obj.use = [ 'libztk', 'libytk', 'libydk-pixbuf' ] - obj.uselib = ' CAIRO PANGO' - else: - obj.uselib = 'GTK' + obj.use = [ 'libztk', 'libytk', 'libydk-pixbuf' ] + obj.uselib = ' CAIRO PANGO' if sys.platform == 'darwin': # Bit of a hack: make a symlink to the .dylib that meets GTK's criteria for finding it (namely that the library must be a *.so diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 21a4b72cf5..dd322d339d 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -52,9 +52,7 @@ def options(opt): pass def configure(conf): - if not conf.is_defined('YTK'): - autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8') - autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1') + pass def build(bld): # operate on copy to avoid adding sources twice @@ -73,19 +71,14 @@ def build(bld): obj.includes = ['.'] obj.name = 'libgtkmm2ext' obj.target = 'gtkmm2ext' - obj.uselib = 'XML CAIROMM PANGOMM' - obj.use = [ 'libpbd' ] + obj.uselib = 'XML CAIROMM PANGOMM GLIBMM GIOMM' + obj.use = [ 'libpbd', 'libydk', 'libydkmm', 'libytkmm' ] obj.vnum = GTKMM2EXT_LIB_VERSION obj.install_path = bld.env['LIBDIR'] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"', 'LOCALEDIR="' + os.path.join( os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] - if bld.is_defined('YTK'): - obj.use += [ 'libydk', 'libydkmm', 'libytkmm' ] - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM GTK' if sys.platform == 'darwin': obj.source += ['gtkapplication_quartz.mm', 'nsglview.mm'] obj.uselib += ' OSX' diff --git a/libs/surfaces/cc121/wscript b/libs/surfaces/cc121/wscript index 26edf8121b..4491e8c64d 100644 --- a/libs/surfaces/cc121/wscript +++ b/libs/surfaces/cc121/wscript @@ -20,11 +20,6 @@ def build(bld): obj.includes = [ '.', './cc121'] obj.name = 'libardour_cc121' obj.target = 'ardour_cc121' - obj.uselib = 'XML OSX' - obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' + obj.uselib = 'XML OSX GLIBMM GIOMM PANGOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM PANGOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/console1/wscript b/libs/surfaces/console1/wscript index ac26bf386f..5668b9cee5 100644 --- a/libs/surfaces/console1/wscript +++ b/libs/surfaces/console1/wscript @@ -22,11 +22,6 @@ def build(bld): obj.includes = [ '.', './console1'] obj.name = 'libardour_console1' obj.target = 'ardour_console1' - obj.uselib = 'SIGCPP XML OSX' - obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libtemporal' + obj.uselib = 'SIGCPP XML OSX GLIBMM GIOMM PANGOMM' + obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libtemporal libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM PANGOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript index 54a10755c4..85f47620d5 100644 --- a/libs/surfaces/contourdesign/wscript +++ b/libs/surfaces/contourdesign/wscript @@ -21,11 +21,6 @@ def build(bld): obj.includes = ['.', '../libs', '../../widgets'] obj.name = 'libardour_contourdesign' obj.target = 'ardour_contourdesign' - obj.uselib = 'USB XML OSX PANGOMM' - obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets' + obj.uselib = 'USB XML OSX PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript index 78408979ed..a38fc4fe4e 100644 --- a/libs/surfaces/faderport/wscript +++ b/libs/surfaces/faderport/wscript @@ -20,11 +20,6 @@ def build(bld): obj.includes = [ '.', './faderport'] obj.name = 'libardour_faderport' obj.target = 'ardour_faderport' - obj.uselib = 'XML OSX PANGOMM' - obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd' + obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/faderport8/wscript b/libs/surfaces/faderport8/wscript index 6b2c49fedf..172b9b4242 100644 --- a/libs/surfaces/faderport8/wscript +++ b/libs/surfaces/faderport8/wscript @@ -25,14 +25,9 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_faderport8' obj.target = 'ardour_faderport8' - obj.uselib = 'XML OSX CAIROMM PANGOMM' - obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' + obj.uselib = 'XML OSX CAIROMM PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' obj = bld(features = 'cxx cxxshlib') obj.source = list(fp8_16_sources) @@ -43,14 +38,9 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_faderport16' obj.target = 'ardour_faderport16' - obj.uselib = 'XML OSX CAIROMM PANGOMM' - obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' + obj.uselib = 'XML OSX CAIROMM PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' obj = bld(features = 'cxx cxxshlib') obj.source = list(fp8_16_sources) @@ -61,11 +51,6 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_faderport2' obj.target = 'ardour_faderport2' - obj.uselib = 'XML OSX CAIROMM PANGOMM' - obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' + obj.uselib = 'XML OSX CAIROMM PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index c9f6b88544..4af9de116c 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -24,11 +24,6 @@ def build(bld): obj.includes = [ '.', './generic_midi'] obj.name = 'libardour_generic_midi' obj.target = 'ardour_generic_midi' - obj.uselib = 'XML OSX' - obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' + obj.uselib = 'XML OSX GLIBMM GIOMM PANGOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM PANGOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/launch_control_xl/wscript b/libs/surfaces/launch_control_xl/wscript index a6321d4ae7..13076fb631 100644 --- a/libs/surfaces/launch_control_xl/wscript +++ b/libs/surfaces/launch_control_xl/wscript @@ -23,11 +23,6 @@ def build(bld): obj.includes = ['.', './launch_control_xl'] obj.name = 'libardour_launch_control_xl' obj.target = 'ardour_launch_control_xl' - obj.uselib = 'SIGCPP XML OSX PANGOMM' - obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal' + obj.uselib = 'SIGCPP XML OSX PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/launchkey_4/wscript b/libs/surfaces/launchkey_4/wscript index 8397377cd2..694ab609ab 100644 --- a/libs/surfaces/launchkey_4/wscript +++ b/libs/surfaces/launchkey_4/wscript @@ -25,14 +25,9 @@ def build(bld): # obj.includes = ['.', ] # obj.name = 'libardour_launchkey_mini' # obj.target = 'ardour_launchkey_mini' -# obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' -# obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' +# obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM' +# obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm' # obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') -# if bld.is_defined('YTK'): -# obj.use += ' libytkmm' -# obj.uselib += ' GLIBMM GIOMM' -# else: -# obj.uselib += ' GTKMM' obj = bld(features = 'cxx cxxshlib') obj.source = list(lpxm_sources) @@ -42,11 +37,6 @@ def build(bld): obj.includes = ['.', ] obj.name = 'libardour_launchkey_4' obj.target = 'ardour_launchkey_4' - obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' - obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' + obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/launchpad_pro/wscript b/libs/surfaces/launchpad_pro/wscript index 4c6bb57a7c..edd07a65fd 100644 --- a/libs/surfaces/launchpad_pro/wscript +++ b/libs/surfaces/launchpad_pro/wscript @@ -22,11 +22,6 @@ def build(bld): obj.includes = ['.', '..', './launchpad_pro'] obj.name = 'libardour_launchpad_pro' obj.target = 'ardour_launchpad_pro' - obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' - obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' + obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/launchpad_x/wscript b/libs/surfaces/launchpad_x/wscript index 4473ed1f91..c6dc896a72 100644 --- a/libs/surfaces/launchpad_x/wscript +++ b/libs/surfaces/launchpad_x/wscript @@ -25,14 +25,9 @@ def build(bld): obj.includes = ['.', ] obj.name = 'libardour_launchpad_mini' obj.target = 'ardour_launchpad_mini' - obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' - obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' + obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' obj = bld(features = 'cxx cxxshlib') obj.source = list(lpxm_sources) @@ -42,11 +37,6 @@ def build(bld): obj.includes = ['.', ] obj.name = 'libardour_launchpad_x' obj.target = 'ardour_launchpad_x' - obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' - obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' + obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index 2345d04a66..74fb353a9e 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -38,14 +38,9 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_mcp' obj.target = 'ardour_mcp' - obj.uselib = 'XML OSX PANGOMM' - obj.use = 'libardour libardour_cp libgtkmm2ext' + obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' obj = bld(features = 'cxx cxxshlib') obj.source = list(mackie_sources) @@ -56,11 +51,6 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_ssl_uf8' obj.target = 'ardour_ssl_uf8' - obj.uselib = 'XML OSX PANGOMM' - obj.use = 'libardour libardour_cp libgtkmm2ext' + obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/maschine2/wscript b/libs/surfaces/maschine2/wscript index f2e37b9e76..be5bae6e20 100644 --- a/libs/surfaces/maschine2/wscript +++ b/libs/surfaces/maschine2/wscript @@ -30,11 +30,6 @@ def build(bld): obj.includes = [ '.', './maschine2'] obj.name = 'libardour_maschine2' obj.target = 'ardour_maschine2' - obj.uselib = 'CAIROMM PANGOMM XML OSX' - obj.use = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext' + obj.uselib = 'CAIROMM PANGOMM XML OSX GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index 859dc700c7..f4e9aede84 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -24,11 +24,6 @@ def build(bld): obj.includes = ['.', './osc'] obj.name = 'libardour_osc' obj.target = 'ardour_osc' - obj.uselib = 'LO XML OSX' - obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' + obj.uselib = 'LO XML OSX GLIBMM GIOMM PANGOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM PANGOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/push2/wscript b/libs/surfaces/push2/wscript index 6c7b8ff9c9..833bd92f06 100644 --- a/libs/surfaces/push2/wscript +++ b/libs/surfaces/push2/wscript @@ -36,11 +36,6 @@ def build(bld): obj.includes = ['.', '..', './push2'] obj.name = 'libardour_push2' obj.target = 'ardour_push2' - obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' - obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' + obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/us2400/wscript b/libs/surfaces/us2400/wscript index a876c15394..1df836369d 100644 --- a/libs/surfaces/us2400/wscript +++ b/libs/surfaces/us2400/wscript @@ -35,11 +35,6 @@ def build(bld): obj.includes = [ '.' ] obj.name = 'libardour_us2400' obj.target = 'ardour_us2400' - obj.uselib = 'XML OSX PANGOMM' - obj.use = 'libardour libardour_cp libgtkmm2ext' + obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += ' libytkmm' - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index 76b4c424c1..a9ea27807c 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -18,11 +18,6 @@ def build(bld): obj.includes = ['.', '../libs'] obj.name = 'libardour_wiimote' obj.target = 'ardour_wiimote' - obj.uselib = 'CWIID XML' - obj.use = 'libardour libardour_cp libgtkmm2ext' + obj.uselib = 'CWIID XML GLIBMM GIOMM PANGOMM' + obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - if bld.is_defined('YTK'): - obj.use += 'libytkmm' - obj.uselib += ' GLIBMM GIOMM PANGOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/waveview/wscript b/libs/waveview/wscript index 521f3f3c5b..f8b368c33f 100644 --- a/libs/waveview/wscript +++ b/libs/waveview/wscript @@ -40,16 +40,10 @@ def build(bld): obj.export_includes = ['.'] obj.includes = ['.'] - obj.uselib = 'SIGCPP PANGOMM CAIROMM BOOST XML TEMPORAL' - obj.use = [ 'libpbd', 'libcanvas', 'libardour', 'libgtkmm2ext', 'libtemporal' ] + obj.uselib = 'SIGCPP PANGOMM CAIROMM BOOST XML TEMPORAL GLIBMM GIOMM' + obj.use = [ 'libpbd', 'libcanvas', 'libardour', 'libgtkmm2ext', 'libtemporal', 'libytkmm' ] obj.name = 'libwaveview' obj.target = 'waveview' obj.vnum = WAVEVIEW_LIB_VERSION obj.install_path = bld.env['LIBDIR'] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] - - if bld.is_defined('YTK'): - obj.use += [ 'libytkmm' ] - obj.uselib += ' GLIBMM GIOMM' - else: - obj.uselib += ' GTKMM' diff --git a/libs/widgets/wscript b/libs/widgets/wscript index 40ca165a61..2a447f6777 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -67,15 +67,10 @@ def build(bld): obj.export_includes = ['.'] obj.includes = ['.'] + bld.env['INCLUDES_GLIB'] - obj.uselib = 'SIGCPP CAIROMM BOOST XML OSX' - obj.use = [ 'libpbd', 'libgtkmm2ext' ] + obj.uselib = 'SIGCPP CAIROMM BOOST XML OSX GLIBMM GIOMM PANGOMM' + obj.use = [ 'libpbd', 'libgtkmm2ext', 'libytkmm' ] obj.name = 'libwidgets' obj.target = 'widgets' obj.vnum = WIDGETS_LIB_VERSION obj.install_path = bld.env['LIBDIR'] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] - if bld.is_defined('YTK'): - obj.use += [ 'libytkmm' ] - obj.uselib += ' GLIBMM GIOMM PANGOMM' - else: - obj.uselib += ' GTKMM' diff --git a/luasession/wscript b/luasession/wscript index 6bc5f26694..beacb5efde 100644 --- a/luasession/wscript +++ b/luasession/wscript @@ -56,10 +56,7 @@ def build(bld): obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' if bld.is_defined('HAVE_SUIL'): - if bld.is_defined('YTK'): - obj.use += [ 'libsuil' ] - else: - obj.uselib += ' SUIL' + obj.use += [ 'libsuil' ] if bld.is_defined('HAVE_USB'): obj.uselib += ' USB' diff --git a/session_utils/wscript b/session_utils/wscript index 2155deabf9..eb38bc142f 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -31,6 +31,7 @@ def build_ardour_util(bld, util): 'libardour_cp', 'libtemporal', 'libmidipp', + 'libsuil', ] obj.defines = [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"', @@ -45,12 +46,6 @@ def build_ardour_util(bld, util): obj.uselib += ' AUDIOUNITS OSX LO ' obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' - if bld.is_defined('HAVE_SUIL'): - if bld.is_defined('YTK'): - obj.use += [ 'libsuil' ] - else: - obj.uselib += ' SUIL' - if bld.is_defined('HAVE_USB'): obj.uselib += ' USB'