diff options
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 27 |
1 files changed, 14 insertions, 13 deletions
@@ -6,6 +6,7 @@ import re import string import subprocess import sys +import platform as PLATFORM def fetch_git_revision (): cmd = "git describe HEAD" @@ -50,15 +51,17 @@ top = '.' out = 'build' children = [ - 'libs/pbd', - 'libs/midi++2', - 'libs/evoral', + # optionally external libraries 'libs/vamp-sdk', 'libs/qm-dsp', 'libs/vamp-plugins', 'libs/taglib', 'libs/libltc', 'libs/rubberband', + # core ardour libraries + 'libs/pbd', + 'libs/midi++2', + 'libs/evoral', 'libs/surfaces', 'libs/panners', 'libs/backends', @@ -72,7 +75,7 @@ children = [ 'export', 'midi_maps', 'mcp', - 'patchfiles' + 'patchfiles', ] i18n_children = [ @@ -84,7 +87,7 @@ i18n_children = [ # Version stuff def fetch_gcc_version (CC): - cmd = "LANG= %s --version" % CC + cmd = "%s --version" % CC output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() o = output[0].decode('utf-8') version = o.split(' ')[2].split('.') @@ -136,7 +139,7 @@ def set_compiler_flags (conf,opt): # Debugging flags debug_flags = [] - u = os.uname () + u = PLATFORM.uname () cpu = u[4] platform = u[0].lower() version = u[2] @@ -804,7 +807,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('C compiler flags', conf.env['CFLAGS']) write_config_text('C++ compiler flags', conf.env['CXXFLAGS']) - write_config_text('Linker flags', conf.env['LINKFLAGS']) + write_config_text('Linker flags', conf.env['LINKFLAGS']) config_text.write ('";\n}\n') config_text.close () @@ -815,18 +818,16 @@ def build(bld): # add directories that contain only headers, to workaround an issue with waf - bld.path.find_dir ('libs/evoral/evoral') if not bld.is_defined('USE_EXTERNAL_LIBS'): bld.path.find_dir ('libs/vamp-sdk/vamp-sdk') - bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol') - bld.path.find_dir ('libs/timecode/timecode') - if not bld.is_defined('USE_EXTERNAL_LIBS'): bld.path.find_dir ('libs/libltc/ltc') bld.path.find_dir ('libs/rubberband/rubberband') + bld.path.find_dir ('libs/taglib/taglib') + bld.path.find_dir ('libs/evoral/evoral') + bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol') + bld.path.find_dir ('libs/timecode/timecode') bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext') bld.path.find_dir ('libs/ardour/ardour') - if not bld.is_defined('USE_EXTERNAL_LIBS'): - bld.path.find_dir ('libs/taglib/taglib') bld.path.find_dir ('libs/pbd/pbd') autowaf.set_recursive() |