X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fcd217cf07f763f7363b4a2d706bcda1bd8efd5e;hb=6485300479041f9d1e43750bad79b22e39aa56a5;hp=bb3157434df6fbf8d634967af2ec8324a15aff10;hpb=91fac4c96dc6210dcc056da70dc608700d7eb570;p=ardour.git diff --git a/wscript b/wscript index bb3157434d..fcd217cf07 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' : { @@ -71,6 +76,14 @@ compiler_flags_dictionaries= { 'ultra-strict' : ['-Wredundant-decls', '-Wstrict-prototypes', '-Wmissing-prototypes'], # Flag to turn on C99 compliance by itself 'c99': '-std=c99', + # 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'], @@ -98,6 +111,10 @@ compiler_flags_dictionaries= { 'cxx-strict' : '', 'strict' : '', 'c99': '/TP', + 'attasm': '', + 'avx': '', + 'pic': '', + 'c-anonymous-union': '', }, } @@ -289,8 +306,12 @@ int main() { return 0; }''', else: compiler_name = 'gcc' - flags_dict = compiler_flags_dictionaries[compiler_name] - + 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: @@ -370,17 +391,15 @@ int main() { return 0; }''', c_flags.append("-Qunused-arguments") cxx_flags.append("-Qunused-arguments") - if ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': - + if (re.search ("(i[0-9]86|x86_64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none': # # ARCH_X86 means anything in the x86 family from i386 to x86_64 # the compile-time presence of the macro _LP64 is used to # distingush 32 and 64 bit assembler # - - if (re.search ("(i[0-9]86|x86_64)", cpu) != None): - compiler_flags.append ("-DARCH_X86") + + compiler_flags.append ("-DARCH_X86") if platform == 'linux' : @@ -405,8 +424,18 @@ int main() { return 0; }''', elif cpu == "i686": compiler_flags.append ("-march=i686") - if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: + 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_dict['attasm'] ]) # end of processor-specific section @@ -416,7 +445,13 @@ int main() { return 0; }''', 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': - compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") + 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/', str(conf.env['CC'])): + 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)") @@ -542,6 +577,8 @@ int main() { return 0; }''', 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) @@ -559,6 +596,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 @@ -569,8 +609,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', @@ -599,8 +637,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', @@ -692,6 +728,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) @@ -745,9 +782,6 @@ def configure(conf): 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: @@ -859,7 +893,7 @@ def configure(conf): autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', mandatory=True) if Options.options.dist_target == 'mingw': - Options.options.fpu_optimization = False + Options.options.fpu_optimization = True conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS') conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW') conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS') @@ -875,7 +909,9 @@ 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 conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') @@ -960,10 +996,16 @@ def configure(conf): autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=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) @@ -987,7 +1029,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': @@ -1043,7 +1084,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')) @@ -1087,9 +1128,11 @@ def build(bld): # set up target directories lwrcase_dirname = 'ardour' + bld.env['MAJOR'] - if bld.is_defined ('TRX_BUILD'): - lwrcase_dirname = 'trx' - + 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 bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname) # data files loaded at run time go here