smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Really remove gtk+ option (see also 1e28ee9cc9)

Browse source 
After patching gtk/ytk to add touch support and macOS rendering,
upstream gtk+2 is no longer an option
This commit is contained in:
Robin Gareus 2025-07-06 15:15:59 +02:00
parent ea4616913c
commit 99c1f50a72
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
26 changed files with 64 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gtk2_ardour/wscript
View file

@ -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, 'pangoft2', uselib_store='PANGOFT2', atleast_version='1.36.8', mandatory=False)
autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') 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: if conf.env.CC_NAME == 'gcc' and Options.options.strict:
conf.define('GLIB_DISABLE_DEPRECATION_WARNINGS', 1) conf.define('GLIB_DISABLE_DEPRECATION_WARNINGS', 1)
for var in ['CFLAGS', 'CXXFLAGS']: for var in ['CFLAGS', 'CXXFLAGS']:
@ -556,11 +552,8 @@ def build(bld):
obj.uselib = 'UUID FLAC FONTCONFIG GTHREAD GTK OGG PANGOMM CURL DL CANVAS FFTW3F LO TAGLIB XML LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' 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.source += [ 'luadoc.cc', 'bundle_env_linux.cc' ]
obj.use += [ 'X11' ] obj.use += [ 'X11' ]
if bld.is_defined('YTK'):
obj.use += [ 'libytk', 'libytkmm' ] obj.use += [ 'libytk', 'libytkmm' ]
obj.uselib += ' GLIBMM GIOMM PANGOMM PANGOFT2 LIBPNG' obj.uselib += ' GLIBMM GIOMM PANGOMM PANGOFT2 LIBPNG'
else:
obj.uselib += ' GTKMM'
if False and bld.is_defined('USE_EXTERNAL_LIBS'): if False and bld.is_defined('USE_EXTERNAL_LIBS'):
obj.uselib += ' LIBAAF' obj.uselib += ' LIBAAF'
@ -571,10 +564,7 @@ def build(bld):
obj.uselib += ' USB' obj.uselib += ' USB'
if bld.is_defined('HAVE_SUIL'): if bld.is_defined('HAVE_SUIL'):
obj.source += [ 'lv2_plugin_ui.cc' ] obj.source += [ 'lv2_plugin_ui.cc' ]
if bld.is_defined('YTK'):
obj.use += [ 'libsuil' ] obj.use += [ 'libsuil' ]
else:
obj.uselib += ' SUIL'
if bld.is_defined('LXVST_SUPPORT'): if bld.is_defined('LXVST_SUPPORT'):
obj.source += [ 'vst_plugin_ui.cc' ] obj.source += [ 'vst_plugin_ui.cc' ]
obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ]
@ -646,6 +636,8 @@ def build(bld):
'libwaveview', 'libwaveview',
'libwidgets', 'libwidgets',
'libptformat', 'libptformat',
'libytk',
'libytkmm',
] ]
obj.defines = [ obj.defines = [
@ -656,13 +648,7 @@ def build(bld):
] ]
obj.install_path = bld.env['DLLDIR'] obj.install_path = bld.env['DLLDIR']
obj.linkflags = bld.env['compiler_flags_dict']['execstack'] 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' 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 bld.is_defined('YTK'):
obj.use += [ 'libytk', 'libytkmm' ]
obj.uselib += ' GLIBMM GIOMM PANGOFT2 LIBPNG'
else:
obj.uselib += ' GTKMM GTK'
if False and bld.is_defined('USE_EXTERNAL_LIBS'): if False and bld.is_defined('USE_EXTERNAL_LIBS'):
obj.uselib += ' LIBAAF' obj.uselib += ' LIBAAF'

3
headless/wscript
View file

@ -41,10 +41,7 @@ def build(bld):
obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
if bld.is_defined('HAVE_SUIL'): if bld.is_defined('HAVE_SUIL'):
if bld.is_defined('YTK'):
obj.use += [ 'libsuil' ] obj.use += [ 'libsuil' ]
else:
obj.uselib += ' SUIL'
if bld.is_defined('HAVE_USB'): if bld.is_defined('HAVE_USB'):
obj.uselib += ' USB' obj.uselib += ' USB'

3
libs/ardour/wscript
View file

@ -438,10 +438,7 @@ def build(bld):
obj.source += ['lv2_plugin.cc', 'lv2_evbuf.cc', 'uri_map.cc'] obj.source += ['lv2_plugin.cc', 'lv2_evbuf.cc', 'uri_map.cc']
obj.uselib += ['LILV'] obj.uselib += ['LILV']
if bld.is_defined('HAVE_SUIL'): if bld.is_defined('HAVE_SUIL'):
if bld.is_defined('YTK'):
obj.use += [ 'libsuil' ] obj.use += [ 'libsuil' ]
else:
obj.uselib += ['SUIL']
if bld.is_defined('WINDOWS_VST_SUPPORT'): if bld.is_defined('WINDOWS_VST_SUPPORT'):
obj.source += [ 'windows_vst_plugin.cc'] obj.source += [ 'windows_vst_plugin.cc']

10
libs/canvas/wscript
View file

@ -78,20 +78,14 @@ def build(bld):
obj.export_includes = ['.'] obj.export_includes = ['.']
obj.includes = ['.'] obj.includes = ['.']
obj.uselib = 'SIGCPP CAIROMM PANGOMM BOOST XML OSX' obj.uselib = 'SIGCPP CAIROMM PANGOMM BOOST XML OSX LIBMM GIOMM'
obj.use = [ 'libpbd', 'libgtkmm2ext' ] obj.use = [ 'libpbd', 'libgtkmm2ext', 'libytkmm' ]
obj.name = 'libcanvas' obj.name = 'libcanvas'
obj.target = 'canvas' obj.target = 'canvas'
obj.vnum = CANVAS_LIB_VERSION obj.vnum = CANVAS_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] 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 # canvas unit-tests are outdated
if False and bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): if False and bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
unit_testobj = bld(features = 'cxx cxxprogram') unit_testobj = bld(features = 'cxx cxxprogram')

3
libs/clearlooks-newer/wscript
View file

@ -28,11 +28,8 @@ def build(bld):
obj.install_path = os.path.join(bld.env['LIBDIR'], 'engines') obj.install_path = os.path.join(bld.env['LIBDIR'], 'engines')
autowaf.ensure_visible_symbols (obj, True) autowaf.ensure_visible_symbols (obj, True)
if bld.is_defined('YTK'):
obj.use = [ 'libztk', 'libytk', 'libydk-pixbuf' ] obj.use = [ 'libztk', 'libytk', 'libydk-pixbuf' ]
obj.uselib = ' CAIRO PANGO' obj.uselib = ' CAIRO PANGO'
else:
obj.uselib = 'GTK'
if sys.platform == 'darwin': 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 # 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

13
libs/gtkmm2ext/wscript
View file

@ -52,9 +52,7 @@ def options(opt):
pass pass
def configure(conf): def configure(conf):
if not conf.is_defined('YTK'): pass
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')
def build(bld): def build(bld):
# operate on copy to avoid adding sources twice # operate on copy to avoid adding sources twice
@ -73,19 +71,14 @@ def build(bld):
obj.includes = ['.'] obj.includes = ['.']
obj.name = 'libgtkmm2ext' obj.name = 'libgtkmm2ext'
obj.target = 'gtkmm2ext' obj.target = 'gtkmm2ext'
obj.uselib = 'XML CAIROMM PANGOMM' obj.uselib = 'XML CAIROMM PANGOMM GLIBMM GIOMM'
obj.use = [ 'libpbd' ] obj.use = [ 'libpbd', 'libydk', 'libydkmm', 'libytkmm' ]
obj.vnum = GTKMM2EXT_LIB_VERSION obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ obj.defines += [
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'LOCALEDIR="' + os.path.join( 'LOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] 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': if sys.platform == 'darwin':
obj.source += ['gtkapplication_quartz.mm', 'nsglview.mm'] obj.source += ['gtkapplication_quartz.mm', 'nsglview.mm']
obj.uselib += ' OSX' obj.uselib += ' OSX'

9
libs/surfaces/cc121/wscript
View file

@ -20,11 +20,6 @@ def build(bld):
obj.includes = [ '.', './cc121'] obj.includes = [ '.', './cc121']
obj.name = 'libardour_cc121' obj.name = 'libardour_cc121'
obj.target = 'ardour_cc121' obj.target = 'ardour_cc121'
obj.uselib = 'XML OSX' obj.uselib = 'XML OSX GLIBMM GIOMM PANGOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/console1/wscript
View file

@ -22,11 +22,6 @@ def build(bld):
obj.includes = [ '.', './console1'] obj.includes = [ '.', './console1']
obj.name = 'libardour_console1' obj.name = 'libardour_console1'
obj.target = 'ardour_console1' obj.target = 'ardour_console1'
obj.uselib = 'SIGCPP XML OSX' obj.uselib = 'SIGCPP XML OSX GLIBMM GIOMM PANGOMM'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libtemporal' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libtemporal libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/contourdesign/wscript
View file

@ -21,11 +21,6 @@ def build(bld):
obj.includes = ['.', '../libs', '../../widgets'] obj.includes = ['.', '../libs', '../../widgets']
obj.name = 'libardour_contourdesign' obj.name = 'libardour_contourdesign'
obj.target = 'ardour_contourdesign' obj.target = 'ardour_contourdesign'
obj.uselib = 'USB XML OSX PANGOMM' obj.uselib = 'USB XML OSX PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/faderport/wscript
View file

@ -20,11 +20,6 @@ def build(bld):
obj.includes = [ '.', './faderport'] obj.includes = [ '.', './faderport']
obj.name = 'libardour_faderport' obj.name = 'libardour_faderport'
obj.target = 'ardour_faderport' obj.target = 'ardour_faderport'
obj.uselib = 'XML OSX PANGOMM' obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

27
libs/surfaces/faderport8/wscript
View file

@ -25,14 +25,9 @@ def build(bld):
obj.includes = [ '.' ] obj.includes = [ '.' ]
obj.name = 'libardour_faderport8' obj.name = 'libardour_faderport8'
obj.target = 'ardour_faderport8' obj.target = 'ardour_faderport8'
obj.uselib = 'XML OSX CAIROMM PANGOMM' obj.uselib = 'XML OSX CAIROMM PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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 = bld(features = 'cxx cxxshlib')
obj.source = list(fp8_16_sources) obj.source = list(fp8_16_sources)
@ -43,14 +38,9 @@ def build(bld):
obj.includes = [ '.' ] obj.includes = [ '.' ]
obj.name = 'libardour_faderport16' obj.name = 'libardour_faderport16'
obj.target = 'ardour_faderport16' obj.target = 'ardour_faderport16'
obj.uselib = 'XML OSX CAIROMM PANGOMM' obj.uselib = 'XML OSX CAIROMM PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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 = bld(features = 'cxx cxxshlib')
obj.source = list(fp8_16_sources) obj.source = list(fp8_16_sources)
@ -61,11 +51,6 @@ def build(bld):
obj.includes = [ '.' ] obj.includes = [ '.' ]
obj.name = 'libardour_faderport2' obj.name = 'libardour_faderport2'
obj.target = 'ardour_faderport2' obj.target = 'ardour_faderport2'
obj.uselib = 'XML OSX CAIROMM PANGOMM' obj.uselib = 'XML OSX CAIROMM PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/generic_midi/wscript
View file

@ -24,11 +24,6 @@ def build(bld):
obj.includes = [ '.', './generic_midi'] obj.includes = [ '.', './generic_midi']
obj.name = 'libardour_generic_midi' obj.name = 'libardour_generic_midi'
obj.target = 'ardour_generic_midi' obj.target = 'ardour_generic_midi'
obj.uselib = 'XML OSX' obj.uselib = 'XML OSX GLIBMM GIOMM PANGOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/launch_control_xl/wscript
View file

@ -23,11 +23,6 @@ def build(bld):
obj.includes = ['.', './launch_control_xl'] obj.includes = ['.', './launch_control_xl']
obj.name = 'libardour_launch_control_xl' obj.name = 'libardour_launch_control_xl'
obj.target = 'ardour_launch_control_xl' obj.target = 'ardour_launch_control_xl'
obj.uselib = 'SIGCPP XML OSX PANGOMM' obj.uselib = 'SIGCPP XML OSX PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

18
libs/surfaces/launchkey_4/wscript
View file

@ -25,14 +25,9 @@ def build(bld):
# obj.includes = ['.', ] # obj.includes = ['.', ]
# obj.name = 'libardour_launchkey_mini' # obj.name = 'libardour_launchkey_mini'
# obj.target = 'ardour_launchkey_mini' # obj.target = 'ardour_launchkey_mini'
# obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' # obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM'
# obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' # obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm'
# obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') # 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 = bld(features = 'cxx cxxshlib')
obj.source = list(lpxm_sources) obj.source = list(lpxm_sources)
@ -42,11 +37,6 @@ def build(bld):
obj.includes = ['.', ] obj.includes = ['.', ]
obj.name = 'libardour_launchkey_4' obj.name = 'libardour_launchkey_4'
obj.target = 'ardour_launchkey_4' obj.target = 'ardour_launchkey_4'
obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/launchpad_pro/wscript
View file

@ -22,11 +22,6 @@ def build(bld):
obj.includes = ['.', '..', './launchpad_pro'] obj.includes = ['.', '..', './launchpad_pro']
obj.name = 'libardour_launchpad_pro' obj.name = 'libardour_launchpad_pro'
obj.target = 'ardour_launchpad_pro' obj.target = 'ardour_launchpad_pro'
obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

18
libs/surfaces/launchpad_x/wscript
View file

@ -25,14 +25,9 @@ def build(bld):
obj.includes = ['.', ] obj.includes = ['.', ]
obj.name = 'libardour_launchpad_mini' obj.name = 'libardour_launchpad_mini'
obj.target = 'ardour_launchpad_mini' obj.target = 'ardour_launchpad_mini'
obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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 = bld(features = 'cxx cxxshlib')
obj.source = list(lpxm_sources) obj.source = list(lpxm_sources)
@ -42,11 +37,6 @@ def build(bld):
obj.includes = ['.', ] obj.includes = ['.', ]
obj.name = 'libardour_launchpad_x' obj.name = 'libardour_launchpad_x'
obj.target = 'ardour_launchpad_x' obj.target = 'ardour_launchpad_x'
obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

18
libs/surfaces/mackie/wscript
View file

@ -38,14 +38,9 @@ def build(bld):
obj.includes = [ '.' ] obj.includes = [ '.' ]
obj.name = 'libardour_mcp' obj.name = 'libardour_mcp'
obj.target = 'ardour_mcp' obj.target = 'ardour_mcp'
obj.uselib = 'XML OSX PANGOMM' obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext' obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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 = bld(features = 'cxx cxxshlib')
obj.source = list(mackie_sources) obj.source = list(mackie_sources)
@ -56,11 +51,6 @@ def build(bld):
obj.includes = [ '.' ] obj.includes = [ '.' ]
obj.name = 'libardour_ssl_uf8' obj.name = 'libardour_ssl_uf8'
obj.target = 'ardour_ssl_uf8' obj.target = 'ardour_ssl_uf8'
obj.uselib = 'XML OSX PANGOMM' obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext' obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/maschine2/wscript
View file

@ -30,11 +30,6 @@ def build(bld):
obj.includes = [ '.', './maschine2'] obj.includes = [ '.', './maschine2']
obj.name = 'libardour_maschine2' obj.name = 'libardour_maschine2'
obj.target = 'ardour_maschine2' obj.target = 'ardour_maschine2'
obj.uselib = 'CAIROMM PANGOMM XML OSX' obj.uselib = 'CAIROMM PANGOMM XML OSX GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext' obj.use = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/osc/wscript
View file

@ -24,11 +24,6 @@ def build(bld):
obj.includes = ['.', './osc'] obj.includes = ['.', './osc']
obj.name = 'libardour_osc' obj.name = 'libardour_osc'
obj.target = 'ardour_osc' obj.target = 'ardour_osc'
obj.uselib = 'LO XML OSX' obj.uselib = 'LO XML OSX GLIBMM GIOMM PANGOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/push2/wscript
View file

@ -36,11 +36,6 @@ def build(bld):
obj.includes = ['.', '..', './push2'] obj.includes = ['.', '..', './push2']
obj.name = 'libardour_push2' obj.name = 'libardour_push2'
obj.target = 'ardour_push2' obj.target = 'ardour_push2'
obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX' obj.uselib = 'CAIROMM PANGOMM USB SIGCPP XML OSX GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/us2400/wscript
View file

@ -35,11 +35,6 @@ def build(bld):
obj.includes = [ '.' ] obj.includes = [ '.' ]
obj.name = 'libardour_us2400' obj.name = 'libardour_us2400'
obj.target = 'ardour_us2400' obj.target = 'ardour_us2400'
obj.uselib = 'XML OSX PANGOMM' obj.uselib = 'XML OSX PANGOMM GLIBMM GIOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext' obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

9
libs/surfaces/wiimote/wscript
View file

@ -18,11 +18,6 @@ def build(bld):
obj.includes = ['.', '../libs'] obj.includes = ['.', '../libs']
obj.name = 'libardour_wiimote' obj.name = 'libardour_wiimote'
obj.target = 'ardour_wiimote' obj.target = 'ardour_wiimote'
obj.uselib = 'CWIID XML' obj.uselib = 'CWIID XML GLIBMM GIOMM PANGOMM'
obj.use = 'libardour libardour_cp libgtkmm2ext' obj.use = 'libardour libardour_cp libgtkmm2ext libytkmm'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') 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'

10
libs/waveview/wscript
View file

@ -40,16 +40,10 @@ def build(bld):
obj.export_includes = ['.'] obj.export_includes = ['.']
obj.includes = ['.'] obj.includes = ['.']
obj.uselib = 'SIGCPP PANGOMM CAIROMM BOOST XML TEMPORAL' obj.uselib = 'SIGCPP PANGOMM CAIROMM BOOST XML TEMPORAL GLIBMM GIOMM'
obj.use = [ 'libpbd', 'libcanvas', 'libardour', 'libgtkmm2ext', 'libtemporal' ] obj.use = [ 'libpbd', 'libcanvas', 'libardour', 'libgtkmm2ext', 'libtemporal', 'libytkmm' ]
obj.name = 'libwaveview' obj.name = 'libwaveview'
obj.target = 'waveview' obj.target = 'waveview'
obj.vnum = WAVEVIEW_LIB_VERSION obj.vnum = WAVEVIEW_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if bld.is_defined('YTK'):
obj.use += [ 'libytkmm' ]
obj.uselib += ' GLIBMM GIOMM'
else:
obj.uselib += ' GTKMM'

9
libs/widgets/wscript
View file

@ -67,15 +67,10 @@ def build(bld):
obj.export_includes = ['.'] obj.export_includes = ['.']
obj.includes = ['.'] + bld.env['INCLUDES_GLIB'] obj.includes = ['.'] + bld.env['INCLUDES_GLIB']
obj.uselib = 'SIGCPP CAIROMM BOOST XML OSX' obj.uselib = 'SIGCPP CAIROMM BOOST XML OSX GLIBMM GIOMM PANGOMM'
obj.use = [ 'libpbd', 'libgtkmm2ext' ] obj.use = [ 'libpbd', 'libgtkmm2ext', 'libytkmm' ]
obj.name = 'libwidgets' obj.name = 'libwidgets'
obj.target = 'widgets' obj.target = 'widgets'
obj.vnum = WIDGETS_LIB_VERSION obj.vnum = WIDGETS_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if bld.is_defined('YTK'):
obj.use += [ 'libytkmm' ]
obj.uselib += ' GLIBMM GIOMM PANGOMM'
else:
obj.uselib += ' GTKMM'

3
luasession/wscript
View file

@ -56,10 +56,7 @@ def build(bld):
obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
if bld.is_defined('HAVE_SUIL'): if bld.is_defined('HAVE_SUIL'):
if bld.is_defined('YTK'):
obj.use += [ 'libsuil' ] obj.use += [ 'libsuil' ]
else:
obj.uselib += ' SUIL'
if bld.is_defined('HAVE_USB'): if bld.is_defined('HAVE_USB'):
obj.uselib += ' USB' obj.uselib += ' USB'

7
session_utils/wscript
View file

@ -31,6 +31,7 @@ def build_ardour_util(bld, util):
'libardour_cp', 'libardour_cp',
'libtemporal', 'libtemporal',
'libmidipp', 'libmidipp',
'libsuil',
] ]
obj.defines = [ obj.defines = [
'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"',
@ -45,12 +46,6 @@ def build_ardour_util(bld, util):
obj.uselib += ' AUDIOUNITS OSX LO ' obj.uselib += ' AUDIOUNITS OSX LO '
obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' 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'): if bld.is_defined('HAVE_USB'):
obj.uselib += ' USB' obj.uselib += ' USB'