X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=a1124f42f67362ff66650e7948a7d62de4f1c5dd;hb=44013380e7253560e3cce93a4303d4fbdba95502;hp=7d806858a06ac99497a6a0a7687b0eccb4028b80;hpb=1e169ea3e8cad35db3ea533b2fb69e31478f00c2;p=ardour.git diff --git a/wscript b/wscript index 7d806858a0..a1124f42f6 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 = '.' @@ -195,6 +201,7 @@ children = [ 'libs/qm-dsp', 'libs/vamp-plugins', 'libs/libltc', + 'libs/ptformat', # core ardour libraries 'libs/pbd', 'libs/midi++2', @@ -310,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') @@ -373,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' ]: @@ -387,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 @@ -399,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' : @@ -430,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 @@ -438,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 @@ -453,8 +462,8 @@ 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. - if re.search ('/^x86_64/', str(conf.env['CC'])): + # 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)") @@ -572,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') @@ -582,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) @@ -602,7 +611,7 @@ int main() { return 0; }''', def is_tracks_build (conf): return conf.env['PROGRAM_NAME'] == 'Tracks Live' - + #---------------------------------------------------------------- # Waf stages @@ -706,6 +715,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) @@ -768,7 +780,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 @@ -780,7 +792,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') @@ -789,7 +801,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']) @@ -851,7 +863,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: @@ -896,6 +908,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') @@ -915,7 +943,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') @@ -933,7 +961,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') @@ -998,6 +1026,9 @@ 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(',') @@ -1006,7 +1037,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' ] @@ -1039,6 +1070,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') @@ -1096,6 +1128,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) @@ -1136,7 +1169,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 @@ -1153,6 +1186,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')