X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=b24e561e960decd4e2a52675817ce11aecbfee82;hb=233c144c2cb0b345f49d9b0f37c3298de86d265a;hp=61e2abd4d1a4c1a7a0b8f11c0933324b4ddfbb7a;hpb=8af992c449b895ec8be638049fd2510388f23ddd;p=ardour.git diff --git a/wscript b/wscript index 61e2abd4d1..b24e561e96 100644 --- a/wscript +++ b/wscript @@ -8,8 +8,9 @@ import subprocess import sys import platform as PLATFORM from waflib.Tools import winres - +from waflib.Build import Context from waflib.Build import BuildContext + class i18n(BuildContext): cmd = 'i18n' fun = 'i18n' @@ -26,6 +27,10 @@ class i18n_mo(BuildContext): cmd = 'i18n_mo' fun = 'i18n_mo' +def is_tracks_build(self, *k, **kw): + return self.env['PROGRAM_NAME'] == 'Tracks Live' + +Context.Context.is_tracks_build = is_tracks_build compiler_flags_dictionaries= { 'gcc' : { @@ -67,12 +72,18 @@ compiler_flags_dictionaries= { 'c-strict' : ['-std=c99', '-pedantic', '-Wshadow'], # Flags used for "strict" compilation, C++ only (i.e. compiler will warn about language issues) 'cxx-strict' : [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', '-fstrict-overflow' ], - # Flags required for whatever consider the strictest possible compilation + # Flags required for whatever consider the strictest possible compilation 'ultra-strict' : ['-Wredundant-decls', '-Wstrict-prototypes', '-Wmissing-prototypes'], - # Flag to turn on C99 compliance by itself + # Flag to turn on C99 compliance by itself 'c99': '-std=c99', - # Flag to enable AT&T assembler syntax - 'attasm': 'asm=att', + # Flag to enable AT&T assembler syntax + 'attasm': '-masm=att', + # Flags to make AVX instructions/intrinsics available + 'avx': '-mavx', + # Flags to generate position independent code, when needed to build a shared object + 'pic': '-fPIC', + # Flags required to compile C code with anonymous unions (only part of C11) + 'c-anonymous-union': '-fms-extensions', }, 'msvc' : { 'debuggable' : ['/DDEBUG', '/Od', '/Zi', '/MDd', '/Gd', '/EHsc'], @@ -100,6 +111,10 @@ compiler_flags_dictionaries= { 'cxx-strict' : '', 'strict' : '', 'c99': '/TP', + 'attasm': '', + 'avx': '', + 'pic': '', + 'c-anonymous-union': '', }, } @@ -164,8 +179,18 @@ else: MICRO = '0' V = MAJOR + '.' + MINOR + '.' + MICRO -VERSION = V -PROGRAM_VERSION = MAJOR +# Ensure that these are not unicode, which +# can cause odd problems elsewhere. Note that +# in python3, encode and decode do not return +# strings, so we have to force the type. +VERSION = V.encode ('ascii', 'ignore').decode ("utf-8") +PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore').decode ("utf-8") + +if len (sys.argv) > 1 and sys.argv[1] == 'dist': + if not 'APPNAME' in os.environ: + print ("You must define APPNAME in the environment when running ./waf dist") + sys.exit (1) + APPNAME = os.environ['APPNAME']; # Mandatory variables top = '.' @@ -176,6 +201,7 @@ children = [ 'libs/qm-dsp', 'libs/vamp-plugins', 'libs/libltc', + 'libs/ptformat', # core ardour libraries 'libs/pbd', 'libs/midi++2', @@ -292,9 +318,13 @@ int main() { return 0; }''', compiler_name = 'gcc' flags_dict = compiler_flags_dictionaries[compiler_name] - + # Save the compiler flags because we need them at build time + # when we need to add compiler specific flags in certain + # libraries + conf.env['compiler_flags_dict'] = flags_dict; + autowaf.set_basic_compiler_flags (conf,flags_dict) - + if conf.options.asan: conf.check_cxx(cxxflags=["-fsanitize=address", "-fno-omit-frame-pointer"], linkflags=["-fsanitize=address"]) cxx_flags.append('-fsanitize=address') @@ -350,7 +380,7 @@ int main() { return 0; }''', # # stupid OS X 10.6 has a bug in math.h that prevents llrint and friends # from being visible. - # + # compiler_flags.append ('-U__STRICT_ANSI__') if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite' ]: @@ -376,10 +406,10 @@ int main() { return 0; }''', # # ARCH_X86 means anything in the x86 family from i386 to x86_64 - # the compile-time presence of the macro _LP64 is used to + # the compile-time presence of the macro _LP64 is used to # distingush 32 and 64 bit assembler # - + compiler_flags.append ("-DARCH_X86") if platform == 'linux' : @@ -407,17 +437,17 @@ int main() { return 0; }''', if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ]) - + if (conf.env['build_target'] == 'mingw'): if (re.search ("(x86_64|AMD64)", cpu) != None): # on Windows sse is supported by 64 bit platforms only build_host_supports_sse = True - + # mingw GCC compiler to uses at&t (Unix specific) assembler dialect by default # compiler_flags.append (["--mmnemonic=att", "msyntax=att") - - compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'], flags_dicts['attasm'] ]) - + + compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'], flags_dict['attasm'] ]) + # end of processor-specific section # optimization section @@ -425,8 +455,14 @@ int main() { return 0; }''', if sys.platform == 'darwin': compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS"); conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate']) - elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64' or (conf.env['build_target'] == 'mingw' and build_host_supports_sse): - compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") + elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': + compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") + elif conf.env['build_target'] == 'mingw': + # usability of the 64 bit windows assembler depends on the compiler target, + # not the build host, which in turn can only be inferred from the name + # of the compiler. + if re.search ('x86_64-w64', str(conf.env['CC'])) != None: + compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") if not build_host_supports_sse: print("\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)") @@ -543,15 +579,17 @@ int main() { return 0; }''', ('-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE', '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64')) cxx_flags.extend( - ('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS', + ('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS', '-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG')) - + if opt.nls: compiler_flags.append('-DENABLE_NLS') compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"') compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"') + conf.env['PROGRAM_NAME'] = Options.options.program_name + if opt.debug: conf.env.append_value('CFLAGS', debug_flags) conf.env.append_value('CXXFLAGS', debug_flags) @@ -569,6 +607,9 @@ int main() { return 0; }''', conf.env.append_value('CXXFLAGS', cxx_flags) conf.env.append_value('LINKFLAGS', linker_flags) +def is_tracks_build (conf): + return conf.env['PROGRAM_NAME'] == 'Tracks Live' + #---------------------------------------------------------------- # Waf stages @@ -579,8 +620,6 @@ def options(opt): autowaf.set_options(opt, debug_by_default=True) opt.add_option('--program-name', type='string', action='store', default='Ardour', dest='program_name', help='The user-visible name of the program being built') - opt.add_option ('--trx', action='store_true', default=False, dest='trx_build', - help='Whether to build for TRX') opt.add_option('--arch', type='string', action='store', dest='arch', help='Architecture-specific compiler FLAGS') opt.add_option('--with-backends', type='string', action='store', default='jack', dest='with_backends', @@ -609,8 +648,6 @@ def options(opt): help='Compile for use with gprofile') opt.add_option('--libjack', type='string', default="auto", dest='libjack_link', help='libjack link mode [auto|link|weak]') - opt.add_option('--no-jack-metadata', action='store_false', default=True, dest='libjack_meta', - help='disable support for jack metadata') opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', help='Build internal libs as shared libraries') opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs', @@ -676,6 +713,9 @@ def options(opt): help='Turn on c++11 compiler flags (-std=c++11)') opt.add_option('--address-sanitizer', action='store_true', default=False, dest='asan', help='Turn on AddressSanitizer (requires GCC >= 4.8 or clang >= 3.1)') + opt.add_option('--ptformat', action='store_true', default=False, dest='ptformat', + help='Turn on PT session import option') + for i in children: opt.recurse(i) @@ -702,6 +742,7 @@ def configure(conf): conf.env['VERSION'] = VERSION conf.env['MAJOR'] = MAJOR conf.env['MINOR'] = MINOR + conf.env['MICRO'] = MICRO conf.line_just = 52 autowaf.set_recursive() autowaf.configure(conf) @@ -737,7 +778,7 @@ def configure(conf): else: # libintl is part of the system, so use it autowaf.display_msg(conf, 'Will rely on libintl built into libc', 'yes') - + user_ardour_root = os.path.expanduser (Options.options.depstack_root + '/a3/inst') if pkg_config_path is not None and pkg_config_path.find (user_ardour_root) >= 0: # told to search user_ardour_root @@ -749,19 +790,16 @@ def configure(conf): autowaf.display_msg(conf, 'Will build against private Ardour dependency stack in ' + user_ardour_root, 'yes') else: autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no') - + if Options.options.freebie: conf.env.append_value ('CFLAGS', '-DSILENCE_AFTER') conf.env.append_value ('CXXFLAGS', '-DSILENCE_AFTER') conf.define ('FREEBIE', 1) - if Options.options.trx_build: - conf.define ('TRX_BUILD', 1) - if Options.options.lv2dir: conf.env['LV2DIR'] = Options.options.lv2dir else: - conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'ardour' + str(conf.env['MAJOR']), 'lv2') + conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'ardour' + str(conf.env['MAJOR']), 'LV2') conf.env['LV2DIR'] = os.path.normpath(conf.env['LV2DIR']) @@ -823,7 +861,7 @@ def configure(conf): print ('No Carbon support available for this build\n') - if Options.options.internal_shared_libs: + if Options.options.internal_shared_libs: conf.define('INTERNAL_SHARED_LIBS', 1) if Options.options.use_external_libs: @@ -868,6 +906,22 @@ def configure(conf): autowaf.check_pkg(conf, 'vamp-hostsdk', uselib_store='VAMPHOSTSDK', atleast_version='2.1', mandatory=True) autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', mandatory=True) + have_rf64_riff_support = conf.check_cc(fragment = ''' +#include +int main () { int x = SFC_AUTO_DOWNGRADE_RF64; return 0; } +''', + features = 'c', + mandatory = False, + execute = False, + use = 'SNDFILE', + msg = 'Checking for sndfile RF64=>RIFF support', + okmsg = 'Found', + errmsg = 'Not found, no RF64-to-WAV support') + + if have_rf64_riff_support: + conf.env.append_value('CXXFLAGS', "-DHAVE_RF64_RIFF") + conf.env.append_value('CFLAGS', "-DHAVE_RF64_RIFF") + if Options.options.dist_target == 'mingw': Options.options.fpu_optimization = True conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS') @@ -885,6 +939,8 @@ def configure(conf): lib='regex', uselib_store="REGEX", define_name='HAVE_REGEX_H') # TODO put this only where it is needed conf.env.append_value('LIB', 'regex') + # TODO this should only be necessary for a debug build + conf.env.append_value('LIB', 'dbghelp') # work around GdkDrawable BitBlt performance issue on windows # see http://gareus.org/wiki/ardour_windows_gdk_and_cairo @@ -903,7 +959,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') # MORE STUFF PROBABLY NEEDED HERE conf.define ('WINDOWS', 1) - + # Tell everyone that this is a waf build conf.env.append_value('CFLAGS', '-DWAF_BUILD') @@ -968,12 +1024,21 @@ def configure(conf): conf.env['DEBUG_DENORMAL_EXCEPTION'] = True if opts.build_tests: autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True) + if opts.ptformat: + conf.define('PTFORMAT', 1) + conf.env['PTFORMAT'] = True backends = opts.with_backends.split(',') + if not backends: print("Must configure and build at least one backend") sys.exit(1) + if conf.is_tracks_build(): + # For Tracks, override backends on OS X or Windows + if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc': + backends = [ 'wavesaudio' ] + conf.env['BACKENDS'] = backends conf.env['BUILD_JACKBACKEND'] = any('jack' in b for b in backends) conf.env['BUILD_ALSABACKEND'] = any('alsa' in b for b in backends) @@ -997,7 +1062,6 @@ def configure(conf): print("ALSA Backend is only available on Linux") sys.exit(1) - set_compiler_flags (conf, Options.options) if sys.platform == 'darwin': @@ -1053,7 +1117,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Freedesktop files', opts.freedesktop) write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) write_config_text('Libjack linking', conf.env['libjack_link']) - write_config_text('Libjack metadata', not conf.is_defined('NO_JACK_METADATA')) + write_config_text('Libjack metadata', conf.is_defined ('HAVE_JACK_METADATA')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) @@ -1061,6 +1125,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Phone home', conf.is_defined('PHONE_HOME')) write_config_text('Program name', opts.program_name) write_config_text('Samplerate', conf.is_defined('HAVE_SAMPLERATE')) + write_config_text('PT format', conf.is_defined('PTFORMAT')) # write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) write_config_text('Translation', opts.nls) # write_config_text('Tranzport', opts.tranzport) @@ -1097,7 +1162,9 @@ def build(bld): # set up target directories lwrcase_dirname = 'ardour' + bld.env['MAJOR'] - if bld.is_defined ('TRX_BUILD'): + if bld.is_tracks_build(): + bld.env.append_value ('CXXFLAGS', '-DUSE_TRACKS_CODE_FEATURES') + bld.env.append_value ('CFLAGS', '-DUSE_TRACKS_CODE_FEATURES') lwrcase_dirname = 'trx' # configuration files go here