diff options
author | David Runge <dave@sleepmap.de> | 2020-01-20 23:08:11 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2020-01-25 04:07:37 +0100 |
commit | 2e9ac80e998bc79d5ef9029415008198b22168dc (patch) | |
tree | 230cc17d741c519a8acc8925e556555c8edbf1cf /libs | |
parent | dfe712c5649ecc248242d35ee55fbb273b7fa150 (diff) |
Towards waf python 2+3 support
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/wscript | 2 | ||||
-rw-r--r-- | libs/pbd/wscript | 17 | ||||
-rw-r--r-- | libs/plugins/a-comp.lv2/wscript | 14 | ||||
-rw-r--r-- | libs/plugins/a-delay.lv2/wscript | 14 | ||||
-rw-r--r-- | libs/plugins/a-eq.lv2/wscript | 14 | ||||
-rw-r--r-- | libs/plugins/a-exp.lv2/wscript | 14 | ||||
-rw-r--r-- | libs/plugins/a-fluidsynth.lv2/wscript | 16 | ||||
-rw-r--r-- | libs/plugins/a-reverb.lv2/wscript | 14 | ||||
-rw-r--r-- | libs/plugins/reasonablesynth.lv2/wscript | 14 | ||||
-rw-r--r-- | libs/ptformat/wscript | 1 | ||||
-rw-r--r-- | libs/surfaces/contourdesign/wscript | 2 | ||||
-rw-r--r-- | libs/surfaces/launch_control_xl/wscript | 2 | ||||
-rw-r--r-- | libs/surfaces/osc/wscript | 2 | ||||
-rw-r--r-- | libs/surfaces/push2/wscript | 4 | ||||
-rw-r--r-- | libs/surfaces/wiimote/wscript | 2 | ||||
-rw-r--r-- | libs/widgets/wscript | 2 |
16 files changed, 72 insertions, 62 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 1b1f12e1ba..3da991be71 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -479,7 +479,7 @@ def build(bld): avx_cxxflags = list(bld.env['CXXFLAGS']) avx_cxxflags.append (bld.env['compiler_flags_dict']['avx']) avx_cxxflags.append (bld.env['compiler_flags_dict']['pic']) - bld(features = 'cxx', + bld(features = 'cxx cxxstlib asm', source = avx_sources, cxxflags = avx_cxxflags, includes = [ '.' ], diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 3fe8b364e2..df9ce4df46 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -109,12 +109,21 @@ def configure(conf): autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True) - conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT',mandatory=False) conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False) conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False) if not Options.options.ppc: - conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600', define_name='HAVE_POSIX_MEMALIGN', mandatory=False) - conf.check(function_name='localtime_r', header_name='time.h', define_name='HAVE_LOCALTIME_R',mandatory=False) + conf.check_cc( + msg="Checking for function 'posix_memalign' in stdlib.h", + fragment = "#define _XOPEN_SOURCE 600\n #include <stdlib.h>\n int main(void) { return posix_memalign (0, 64, 1); }\n", + define_name='HAVE_POSIX_MEMALIGN', execute = False, mandatory=False) + conf.check_cc( + msg="Checking for function 'getmntent' in mntent.h", + fragment = "#include <mntent.h>\n int main(void) { return (int)getmntent(0); }\n", + define_name='HAVE_GETMNTENT', execute = False, mandatory=False) + conf.check_cc( + msg="Checking for function 'localtime_r' in time.h", + fragment = "#include <time.h>\n int main(void) { return localtime_r(NULL, NULL); }\n", + define_name='HAVE_LOCALTIME_R', execute = False, mandatory=False) # Boost headers autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp') @@ -162,7 +171,7 @@ def build(bld): obj.includes = ['.'] obj.name = 'libpbd' obj.target = 'pbd' - obj.uselib = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM ARCHIVE CURL' + obj.uselib = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM ARCHIVE CURL XML' if sys.platform == 'darwin': TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] if 'cocoa_open_uri.mm' not in obj.source: diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index fa71d2300a..9c841d08dc 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -24,15 +24,15 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined ('HAVE_LV2'): + if bld.is_defined('HAVE_LV2'): # Build RDF files for i in ['manifest.ttl', 'a-comp.ttl', 'a-comp#stereo.ttl', 'presets.ttl']: - bld(features = 'subst', - source = i + '.in', - target = '../../LV2/%s/%s' % (bundle, i), - install_path = '${LV2DIR}/%s' % bundle, - chmod = Utils.O644, - LIB_EXT = module_ext) + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.dict = {'LIB_EXT': module_ext} # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript index be56763059..24fac5ff4a 100644 --- a/libs/plugins/a-delay.lv2/wscript +++ b/libs/plugins/a-delay.lv2/wscript @@ -24,15 +24,15 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined ('HAVE_LV2'): + if bld.is_defined('HAVE_LV2'): # Build RDF files for i in ['manifest.ttl', 'a-delay.ttl', 'presets.ttl']: - bld(features = 'subst', - source = i + '.in', - target = '../../LV2/%s/%s' % (bundle, i), - install_path = '${LV2DIR}/%s' % bundle, - chmod = Utils.O644, - LIB_EXT = module_ext) + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.dict = {'LIB_EXT': module_ext} # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript index 36e9432499..c3f2b35cd4 100644 --- a/libs/plugins/a-eq.lv2/wscript +++ b/libs/plugins/a-eq.lv2/wscript @@ -24,15 +24,15 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined ('HAVE_LV2'): + if bld.is_defined('HAVE_LV2'): # Build RDF files for i in ['manifest.ttl', 'a-eq.ttl']: - bld(features = 'subst', - source = i + '.in', - target = '../../LV2/%s/%s' % (bundle, i), - install_path = '${LV2DIR}/%s' % bundle, - chmod = Utils.O644, - LIB_EXT = module_ext) + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.dict = {'LIB_EXT': module_ext} # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript index 46e3b4f69e..7fb14a4e80 100644 --- a/libs/plugins/a-exp.lv2/wscript +++ b/libs/plugins/a-exp.lv2/wscript @@ -24,15 +24,15 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined ('HAVE_LV2'): + if bld.is_defined('HAVE_LV2'): # Build RDF files for i in ['manifest.ttl', 'a-exp.ttl', 'a-exp#stereo.ttl']: - bld(features = 'subst', - source = i + '.in', - target = '../../LV2/%s/%s' % (bundle, i), - install_path = '${LV2DIR}/%s' % bundle, - chmod = Utils.O644, - LIB_EXT = module_ext) + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.dict = {'LIB_EXT': module_ext} # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript index 088fe3d876..462b4f89db 100644 --- a/libs/plugins/a-fluidsynth.lv2/wscript +++ b/libs/plugins/a-fluidsynth.lv2/wscript @@ -23,15 +23,15 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined ('HAVE_LV2'): + if bld.is_defined('HAVE_LV2'): # Build RDF files for i in ['manifest.ttl', 'a-fluidsynth.ttl']: - bld(features = 'subst', - source = i + '.in', - target = '../../LV2/%s/%s' % (bundle, i), - install_path = '${LV2DIR}/%s' % bundle, - chmod = Utils.O644, - LIB_EXT = module_ext) + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.dict = {'LIB_EXT': module_ext} # Build plugin library obj = bld(features = 'cxx cshlib', @@ -41,7 +41,7 @@ def build(bld): includes = [ '../../ardour' ], target = '../../LV2/%s/a-fluidsynth' % bundle, install_path = '${LV2DIR}/%s' % bundle, - uselib = ['LIBFLUIDSYNTH'], + uselib = ['LIBFLUIDSYNTH', 'GLIB'], use = ['LV2_1_0_0'] ) diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript index e5657ad716..04cbd11cab 100644 --- a/libs/plugins/a-reverb.lv2/wscript +++ b/libs/plugins/a-reverb.lv2/wscript @@ -23,15 +23,15 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined ('HAVE_LV2'): + if bld.is_defined('HAVE_LV2'): # Build RDF files for i in ['manifest.ttl', 'a-reverb.ttl']: - bld(features = 'subst', - source = i + '.in', - target = '../../LV2/%s/%s' % (bundle, i), - install_path = '${LV2DIR}/%s' % bundle, - chmod = Utils.O644, - LIB_EXT = module_ext) + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.dict = {'LIB_EXT': module_ext} # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript index 4b51891af2..73cbe6a089 100644 --- a/libs/plugins/reasonablesynth.lv2/wscript +++ b/libs/plugins/reasonablesynth.lv2/wscript @@ -23,15 +23,15 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined ('HAVE_LV2'): + if bld.is_defined('HAVE_LV2'): # Build RDF files for i in ['manifest.ttl', 'reasonablesynth.ttl']: - bld(features = 'subst', - source = i + '.in', - target = '../../LV2/%s/%s' % (bundle, i), - install_path = '${LV2DIR}/%s' % bundle, - chmod = Utils.O644, - LIB_EXT = module_ext) + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.dict = {'LIB_EXT': module_ext} # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript index 1f2c06a0a8..9ec3bd1a5a 100644 --- a/libs/ptformat/wscript +++ b/libs/ptformat/wscript @@ -42,6 +42,7 @@ def build(bld): obj.name = 'libptformat' obj.target = 'ptformat' obj.use = 'libpbd' + obj.uselib = 'GLIBMM' obj.vnum = LIBPTFORMAT_LIB_VERSION obj.install_path = bld.env['LIBDIR'] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript index 7c1e40cb31..4f070028e2 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' + obj.uselib = 'GTKMM USB XML' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets' 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 d8d1fa8010..97f4f2222c 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' + obj.uselib = 'GTKMM SIGCPP XML' obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index 4d0dba6750..5bbe7d3946 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' + obj.uselib = 'LO GTKMM GTK GDK XML' 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 806828cbd4..a025e12d59 100644 --- a/libs/surfaces/push2/wscript +++ b/libs/surfaces/push2/wscript @@ -39,10 +39,10 @@ def build(bld): obj.defines = [ 'PACKAGE="ardour_push2"' ] obj.defines += [ 'ARDOURSURFACE_DLL_EXPORTS' ] obj.defines += [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"' ] - obj.includes = [ '.', './push2'] + obj.includes = ['.', './push2'] obj.name = 'libardour_push2' obj.target = 'ardour_push2' - obj.uselib = 'CAIROMM PANGOMM USB GTKMM SIGCPP' + obj.uselib = 'CAIROMM PANGOMM USB GTKMM SIGCPP XML' 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/wiimote/wscript b/libs/surfaces/wiimote/wscript index 03d01635a1..d38296f37f 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -24,7 +24,7 @@ def build(bld): obj.includes = ['.', '../libs'] obj.name = 'libardour_wiimote' obj.target = 'ardour_wiimote' - obj.uselib = 'GTKMM CWIID' + obj.uselib = 'GTKMM CWIID XML' 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 8be3c4ba32..d1b4aab0ac 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -74,7 +74,7 @@ def build(bld): obj.defines = [ ] obj.export_includes = ['.'] - obj.includes = ['.'] + obj.includes = ['.'] + bld.env['INCLUDES_GLIB'] obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST XML' obj.use = [ 'libpbd', 'libgtkmm2ext' ] obj.name = 'libwidgets' |