X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=4319de317b05f3c9b477a47db52dd93e5ab20603;hb=1451d8043a4be06859724ad928cdb658fdd9bc9c;hp=3e72fbc9720199e4e5c2a741cd9590373841d5e7;hpb=46667116397121a35598e3a62c683ebffa78046f;p=ardour.git diff --git a/wscript b/wscript index 3e72fbc972..4319de317b 100644 --- a/wscript +++ b/wscript @@ -72,9 +72,9 @@ 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': '-masm=att', @@ -183,8 +183,14 @@ V = MAJOR + '.' + MINOR + '.' + MICRO # can cause odd problems elsewhere. Note that # in python3, encode and decode do not return # strings, so we have to force the type. -VERSION = str (V.encode ('ascii', 'ignore')) -PROGRAM_VERSION = str (MAJOR.encode ('ascii', 'ignore')) +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 = '.' @@ -311,14 +317,14 @@ 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: conf.check_cxx(cxxflags=["-fsanitize=address", "-fno-omit-frame-pointer"], linkflags=["-fsanitize=address"]) cxx_flags.append('-fsanitize=address') @@ -374,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' ]: @@ -388,6 +394,8 @@ int main() { return 0; }''', linker_flags.append('--stdlib=libstdc++') # Prevents visibility issues in standard headers conf.define("_DARWIN_C_SOURCE", 1) + else: + cxx_flags.append('-DBOOST_NO_AUTO_PTR') if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite']: # Silence warnings about the non-existing osx clang compiler flags @@ -400,10 +408,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' : @@ -431,7 +439,7 @@ 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 @@ -439,7 +447,7 @@ int main() { return 0; }''', # 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 @@ -454,7 +462,7 @@ int main() { return 0; }''', 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. + # 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: @@ -573,9 +581,9 @@ 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') @@ -583,7 +591,7 @@ int main() { return 0; }''', 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) @@ -603,7 +611,7 @@ int main() { return 0; }''', def is_tracks_build (conf): return conf.env['PROGRAM_NAME'] == 'Tracks Live' - + #---------------------------------------------------------------- # Waf stages @@ -742,12 +750,6 @@ def configure(conf): autowaf.configure(conf) autowaf.display_header('Ardour Configuration') - gcc_versions = fetch_gcc_version(str(conf.env['CC'])) - if not Options.options.debug and gcc_versions[0] == '4' and gcc_versions[1] > '4': - print('Version 4.5 of gcc is not ready for use when compiling Ardour with optimization.') - print('Please use a different version or re-configure with --debug') - exit (1) - # systems with glibc have libintl builtin. systems without require explicit # linkage against libintl. # @@ -772,7 +774,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 @@ -784,7 +786,7 @@ 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') @@ -793,7 +795,7 @@ def configure(conf): 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']) @@ -855,7 +857,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: @@ -900,6 +902,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') @@ -919,7 +937,7 @@ def configure(conf): 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') @@ -937,7 +955,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') @@ -1013,7 +1031,7 @@ def configure(conf): sys.exit(1) if conf.is_tracks_build(): - # For Tracks, override backends on OS X or Windows + # For Tracks, override backends on OS X or Windows if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc': backends = [ 'wavesaudio' ] @@ -1046,6 +1064,7 @@ def configure(conf): sub_config_and_use(conf, 'libs/appleutility') elif Options.options.dist_target != 'mingw': sub_config_and_use(conf, 'tools/sanity_check') + sub_config_and_use(conf, 'tools/gccabicheck') sub_config_and_use(conf, 'libs/clearlooks-newer') @@ -1084,6 +1103,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Free/Demo copy', conf.is_defined('FREEBIE')) write_config_text('Build target', conf.env['build_target']) write_config_text('CoreAudio', conf.is_defined('HAVE_COREAUDIO')) + write_config_text('CoreAudio 10.5 compat', conf.is_defined('COREAUDIO105')) write_config_text('CoreAudio/Midi Backend',conf.env['BUILD_CORECRAPPITA']) write_config_text('Debug RT allocations', conf.is_defined('DEBUG_RT_ALLOC')) write_config_text('Debug Symbols', conf.is_defined('debug_symbols') or conf.env['DEBUG']) @@ -1144,7 +1164,7 @@ def build(bld): 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 @@ -1161,6 +1181,7 @@ def build(bld): bld.recurse('libs/appleutility') elif bld.env['build_target'] != 'mingw': bld.recurse('tools/sanity_check') + bld.recurse('tools/gccabicheck') bld.recurse('libs/clearlooks-newer')