X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=0fc9358fb00d9a37223a346165f6a5e4a9858ac8;hb=6e469ffb5e0fa93fff77f7559e5b94861f9e1be7;hp=84a8fb3e6c4a6db357cf7922718f1d2e7daa53bc;hpb=c912bd61ae49cc79158f3322439c29b27ef51de8;p=ardour.git diff --git a/wscript b/wscript index 84a8fb3e6c..0fc9358fb0 100644 --- a/wscript +++ b/wscript @@ -28,20 +28,22 @@ class i18n_mo(BuildContext): fun = 'i18n_mo' def is_tracks_build(self, *k, **kw): - return self.env['PROGRAM_NAME'] == 'Tracks Live' + return self.env['PROGRAM_NAME'] == 'Tracks Live' Context.Context.is_tracks_build = is_tracks_build compiler_flags_dictionaries= { 'gcc' : { # Flags required when building a debug build - 'debuggable' : [ '-O0', '-g' ], + 'debuggable' : [ '-g' ], # Flags required for the linker (if any) when building a debug build 'linker-debuggable' : '', # Flags required when building a non-debug optimized build 'nondebuggable' : '-DNDEBUG', - # Flags required to enable profiling at runtime - 'profile' : '-pg', + # Flags required to enable profiling at runtime with optimized builds + 'profile' : [ '-fno-omit-frame-pointer' ], + # Flags required to enable gprofile profiling + 'gprofile' : '-pg', # Flags required to disable warnings about unused arguments to function calls 'silence-unused-arguments' : '', # Flags required to use SSE unit for general math @@ -72,18 +74,24 @@ 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', + # 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'], 'linker-debuggable' : ['/DEBUG', '/INCREMENTAL' ], 'nondebuggable' : ['/DNDEBUG', '/Ob1', '/MD', '/Gd', '/EHsc'], - 'profile' : '', + 'profile' : '/Oy-', 'sse' : '/arch:SSE', 'silence-unused-arguments' : '', 'sse' : '', @@ -105,6 +113,10 @@ compiler_flags_dictionaries= { 'cxx-strict' : '', 'strict' : '', 'c99': '/TP', + 'attasm': '', + 'avx': '', + 'pic': '', + 'c-anonymous-union': '', }, } @@ -123,10 +135,11 @@ clang_dict['sse'] = '' clang_dict['fpmath-sse'] = '' clang_dict['xmmintrinsics'] = '' clang_dict['silence-unused-arguments'] = '-Qunused-arguments' -clang_dict['extra-cxx-warnings'] = [ '-Woverloaded-virtual', '-Wno-mismatched-tags' ] +clang_dict['extra-cxx-warnings'] = [ '-Woverloaded-virtual', '-Wno-mismatched-tags', '-Wno-cast-align', '-Wno-unused-local-typedefs' ] clang_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', '-fstrict-overflow' ] clang_dict['strict'] = ['-Wall', '-Wcast-align', '-Wextra', '-Wwrite-strings' ] clang_dict['generic-x86'] = [ '-arch', 'i386' ] +clang_dict['full-optimization'] = [ '-O3', '-fomit-frame-pointer', '-ffast-math', ] compiler_flags_dictionaries['clang'] = clang_dict; clang_darwin_dict = compiler_flags_dictionaries['clang'].copy(); @@ -135,7 +148,7 @@ clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math', '-fstrength-red compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict; def fetch_git_revision (): - cmd = "git describe HEAD | sed 's/^[A-Za-z]*+//'" + cmd = "git describe HEAD | sed 's/^[A-Za-z0-9]*+//'" output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() rev = output[0].decode ('utf-8') return rev @@ -169,8 +182,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 = '.' @@ -181,6 +204,8 @@ children = [ 'libs/qm-dsp', 'libs/vamp-plugins', 'libs/libltc', + 'libs/lua', + 'libs/ptformat', # core ardour libraries 'libs/pbd', 'libs/midi++2', @@ -194,17 +219,22 @@ children = [ 'libs/audiographer', 'libs/canvas', 'libs/plugins/reasonablesynth.lv2', + 'libs/plugins/a-comp.lv2', + 'libs/plugins/a-delay.lv2', 'gtk2_ardour', 'export', 'midi_maps', 'mcp', 'patchfiles', + 'scripts', 'headless', + 'session_utils', # shared helper binaries (plugin-scanner, exec-wrapper) 'libs/fst', 'libs/vfork', 'libs/ardouralsautil', 'cfgtool', + 'tools/luadevel', ] i18n_children = [ @@ -297,9 +327,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') @@ -307,7 +341,7 @@ int main() { return 0; }''', linker_flags.append('-fsanitize=address') if opt.gprofile: - debug_flags = [ flags_dict['profile'] ] + debug_flags = [ flags_dict['gprofile'] ] # OSX if platform == 'darwin': @@ -315,6 +349,8 @@ int main() { return 0; }''', conf.env['build_host'] = 'mavericks' elif re.search ("^14[.]", version) != None: conf.env['build_host'] = 'yosemite' + elif re.search ("^15[.]", version) != None: + conf.env['build_host'] = 'el_capitan' else: conf.env['build_host'] = 'irrelevant' @@ -336,8 +372,10 @@ int main() { return 0; }''', conf.env['build_target'] = 'mountainlion' elif re.search ("^13[.]", version) != None: conf.env['build_target'] = 'mavericks' - else: + elif re.search ("^14[.]", version) != None: conf.env['build_target'] = 'yosemite' + else: + conf.env['build_target'] = 'el_capitan' else: match = re.search( "(?Pi[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)", @@ -355,22 +393,31 @@ 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' ]: + if opt.use_libcpp or conf.env['build_host'] in [ 'el_capitan' ]: + cxx_flags.append('--stdlib=libc++') + linker_flags.append('--stdlib=libc++') + + if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan' ]: conf.check_cxx(cxxflags=["-std=c++11"]) cxx_flags.append('-std=c++11') if platform == "darwin": - cxx_flags.append('--stdlib=libstdc++') # Mavericks and later changed the syntax to be used when including Carbon headers, # from requiring a full path to requiring just the header name. cxx_flags.append('-DCARBON_FLAT_HEADERS') - linker_flags.append('--stdlib=libstdc++') + + if not opt.use_libcpp and not conf.env['build_host'] in [ 'el_capitan' ]: + cxx_flags.append('--stdlib=libstdc++') + 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']: + + if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite', 'el_capitan']: # Silence warnings about the non-existing osx clang compiler flags # -compatibility_version and -current_version. These are Waf # generated and not needed with clang @@ -381,10 +428,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' : @@ -412,17 +459,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_dict['attasm'] ]) - + # end of processor-specific section # optimization section @@ -431,13 +478,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") + # 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)") @@ -449,10 +496,9 @@ int main() { return 0; }''', if conf.env['build_target'] == 'x86_64' and opt.windows_vst: print("\n\n==================================================") - print("You cannot use VST plugins with a 64 bit host. Please run waf with --windows-vst=0") - print("\nIt is theoretically possible to build a 32 bit host on a 64 bit system.") - print("However, this is tricky and not recommended for beginners.") - sys.exit (-1) + print("64bit Windows VST support on 64bit Linux is experimental.") + print("(This version of ardour will not load 32bit VSTs)") + print("==================================================\n\n") if conf.env['LXVST_SUPPORT'] == True: if conf.env['build_target'] == 'x86_64': @@ -482,7 +528,7 @@ int main() { return 0; }''', ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070", '-mmacosx-version-min=10.7')) - elif conf.env['build_target'] in [ 'mavericks', 'yosemite' ]: + elif conf.env['build_target'] in [ 'mavericks', 'yosemite', 'el_capitan' ]: compiler_flags.extend( ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090", "-mmacosx-version-min=10.8")) @@ -518,9 +564,15 @@ int main() { return 0; }''', if opt.debug_symbols: optimization_flags += flags_dict['debuggable'] + if opt.profile: + optimization_flags += flags_dict['profile'] + if opt.stl_debug: cxx_flags.append("-D_GLIBCXX_DEBUG") + if re.search ("freebsd", sys.platform) != None: + linker_flags.append('-lexecinfo') + if conf.env['DEBUG_RT_ALLOC']: compiler_flags.append('-DDEBUG_RT_ALLOC') linker_flags.append('-ldl') @@ -554,17 +606,25 @@ 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') + # use sparingly, prefer runtime profile + if Options.options.program_name.lower() == "mixbus": + compiler_flags.append ('-DMIXBUS') + + if Options.options.program_name.lower() == "mixbus32c": + compiler_flags.append ('-DMIXBUS') + compiler_flags.append ('-DMIXBUS32C') + 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) @@ -582,9 +642,19 @@ int main() { return 0; }''', conf.env.append_value('CXXFLAGS', cxx_flags) conf.env.append_value('LINKFLAGS', linker_flags) +def create_resource_file(icon): + try: + text = 'IDI_ICON1 ICON DISCARDABLE "icons/' + icon + '.ico"\n' + o = open('gtk2_ardour/windows_icon.rc', 'w') + o.write(text) + o.close() + except IOError: + print('Could not open gtk2_ardour/windows_icon.rc for writing\n') + sys.exit(-1) + def is_tracks_build (conf): - return conf.env['PROGRAM_NAME'] == 'Tracks Live' - + return conf.env['PROGRAM_NAME'] == 'Tracks Live' + #---------------------------------------------------------------- # Waf stages @@ -598,7 +668,7 @@ def options(opt): 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', - help='Specify which backend modules are to be included(jack,alsa,wavesaudio,dummy,coreaudio)') + help='Specify which backend modules are to be included(jack,alsa,dummy,portaudio,coreaudio)') opt.add_option('--backtrace', action='store_true', default=False, dest='backtrace', help='Compile with -rdynamic -- allow obtaining backtraces from within Ardour') opt.add_option('--no-carbon', action='store_true', default=False, dest='nocarbon', @@ -616,9 +686,11 @@ def options(opt): opt.add_option('--no-fpu-optimization', action='store_false', dest='fpu_optimization') opt.add_option('--exports-hidden', action='store_true', default=False, dest='exports_hidden') opt.add_option('--freedesktop', action='store_true', default=False, dest='freedesktop', - help='Install MIME type, icons and .desktop file as per freedesktop.org standards') + help='Build MIME type and .desktop files as per freedesktop.org standards (will be placed in build/gtk2_ardour)') opt.add_option('--freebie', action='store_true', default=False, dest='freebie', help='Build a version suitable for distribution as a zero-cost binary') + opt.add_option('--profile', action='store_true', default=False, dest='profile', + help='Compile for use with profiling tools requiring a frame pointer') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') opt.add_option('--libjack', type='string', default="auto", dest='libjack_link', @@ -629,6 +701,8 @@ def options(opt): help='Build internal libs as static libraries') opt.add_option('--use-external-libs', action='store_true', default=False, dest='use_external_libs', help='Use external/system versions of some bundled libraries') + opt.add_option('--luadoc', action='store_true', default=False, dest='luadoc', + help='Compile Tool to dump LuaBindings (needs C++11)') opt.add_option('--lv2', action='store_true', default=True, dest='lv2', help='Compile with support for LV2 (if Lilv+Suil is available)') opt.add_option('--no-lv2', action='store_false', dest='lv2', @@ -686,8 +760,15 @@ def options(opt): help='Do not ask questions that require confirmation during the build') opt.add_option('--cxx11', action='store_true', default=False, dest='cxx11', help='Turn on c++11 compiler flags (-std=c++11)') + opt.add_option('--use-libc++', action='store_true', default=False, dest='use_libcpp', + help='use libc++ instead of default or auto-detected stdlib') 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') + opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews', + help='Disable threaded waveview rendering') + for i in children: opt.recurse(i) @@ -711,6 +792,19 @@ def configure(conf): conf.env['CFLAGS'] = [] conf.env['CXXFLAGS'] = [] + # freedesktop translations needs itstool > 1.0.3 (-j option) + if Options.options.freedesktop: + output = subprocess.Popen("itstool --version", shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() + o = output[0].decode('utf-8') + itstool = o.split(' ')[0] + version = o.split(' ')[1].split('.') + # use distutils.version.StrictVersion or something python to check >= 1.0.4 + # but first make sure that all build-hosts (incl. OSX-10.5/PPC) have that python lib. + # lazy approach: just use major version 2.X.X + if itstool != "itstool" or version[0] < "2": + print("--freedesktop requires itstool > 2.0.0 to translate files.") + sys.exit(-1) + conf.env['VERSION'] = VERSION conf.env['MAJOR'] = MAJOR conf.env['MINOR'] = MINOR @@ -720,12 +814,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. # @@ -750,7 +838,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 @@ -762,7 +850,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') @@ -771,7 +859,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']) @@ -783,9 +871,7 @@ def configure(conf): conf.define ('HAVE_COREAUDIO', 1) conf.define ('AUDIOUNIT_SUPPORT', 1) - conf.define ('GTKOSX', 1) conf.define ('TOP_MENUBAR',1) - conf.define ('GTKOSX',1) # It would be nice to be able to use this to force back-compatibility with 10.4 # but even by the time of 11, the 10.4 SDK is no longer available in any normal @@ -833,7 +919,11 @@ def configure(conf): print ('No Carbon support available for this build\n') - if Options.options.internal_shared_libs: + if Options.options.luadoc: + conf.env['LUABINDINGDOC'] = True + conf.define ('LUABINDINGDOC', 1) + + if Options.options.internal_shared_libs: conf.define('INTERNAL_SHARED_LIBS', 1) if Options.options.use_external_libs: @@ -855,7 +945,10 @@ def configure(conf): # executing a test program is n/a when cross-compiling if Options.options.dist_target != 'mingw': if Options.options.dist_target != 'msvc': - conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') + if re.search ("freebsd", sys.platform) != None: + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', uselib_store='DL') + else: + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", execute = "1", mandatory = True, @@ -878,6 +971,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_RF64_AUTO_DOWNGRADE; 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') @@ -897,13 +1006,30 @@ 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') conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') conf.define ('WINDOWS', 1) + have_ptw_semaphore = conf.check_cc(fragment = ''' +#include +#include +int main () { return 0; } +''', + features = 'c', + mandatory = False, + execute = False, + msg = 'Checking for pthread posix semaphore', + okmsg = 'Found', + errmsg = 'Not found, falling back to Windows Semaphore.') + + #if have_ptw_semaphore: + # conf.define('USE_PTW32_SEMAPHORE', 1) + # conf.env.append_value('CFLAGS', '-DUSE_PTW32_SEMAPHORE') + # conf.env.append_value('CXXFLAGS', '-DUSE_PTW32_SEMAPHORE') + if Options.options.dist_target == 'msvc': conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS') conf.env.append_value('CFLAGS', '-DCOMPILER_MSVC') @@ -915,7 +1041,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') @@ -943,6 +1069,8 @@ def configure(conf): conf.env['PHONE_HOME'] = True if opts.fpu_optimization: conf.env['FPU_OPTIMIZATION'] = True + if opts.freedesktop: + conf.env['FREEDESKTOP'] = True if opts.nls: conf.define('ENABLE_NLS', 1) conf.env['ENABLE_NLS'] = True @@ -980,37 +1108,34 @@ 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 + if opts.no_threaded_waveviews: + conf.define('NO_THREADED_WAVEVIEWS', 1) + conf.env['NO_THREADED_WAVEVIEWS'] = 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) conf.env['BUILD_DUMMYBACKEND'] = any('dummy' in b for b in backends) - conf.env['BUILD_WAVESBACKEND'] = any('wavesaudio' in b for b in backends) + conf.env['BUILD_PABACKEND'] = any('portaudio' in b for b in backends) conf.env['BUILD_CORECRAPPITA'] = any('coreaudio' in b for b in backends) - if conf.env['BUILD_CORECRAPPITA'] and conf.env['BUILD_WAVESBACKEND']: - print("Coreaudio + Waves Backend are mutually exclusive") + if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']: + print("PortAudio Backend is not for Linux") sys.exit(1) if sys.platform != 'darwin' and conf.env['BUILD_CORECRAPPITA']: print("Coreaudio backend is only available for OSX") sys.exit(1) - if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and conf.env['BUILD_WAVESBACKEND']: - print("Waves Backend is not for Linux") - sys.exit(1) - if re.search ("linux", sys.platform) == None and conf.env['BUILD_ALSABACKEND']: print("ALSA Backend is only available on Linux") sys.exit(1) @@ -1021,6 +1146,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') @@ -1051,7 +1177,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Use External Libraries', conf.is_defined('USE_EXTERNAL_LIBS')) write_config_text('Library exports hidden', conf.is_defined('EXPORT_VISIBILITY_HIDDEN')) - write_config_text('ALSA Backend', conf.env['BUILD_ALSABACKEND']) write_config_text('ALSA DBus Reservation', conf.is_defined('HAVE_DBUS')) write_config_text('Architecture flags', opts.arch) write_config_text('Aubio', conf.is_defined('HAVE_AUBIO')) @@ -1059,36 +1184,43 @@ 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/Midi Backend',conf.env['BUILD_CORECRAPPITA']) + write_config_text('CoreAudio 10.5 compat', conf.is_defined('COREAUDIO105')) 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']) - write_config_text('Dummy backend', conf.env['BUILD_DUMMYBACKEND']) write_config_text('Process thread timing', conf.is_defined('PT_TIMING')) write_config_text('Denormal exceptions', conf.is_defined('DEBUG_DENORMAL_EXCEPTION')) write_config_text('FLAC', conf.is_defined('HAVE_FLAC')) write_config_text('FPU optimization', opts.fpu_optimization) 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', conf.is_defined ('HAVE_JACK_METADATA')) + write_config_text('Lua Binding Doc', conf.is_defined('LUABINDINGDOC')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) + write_config_text('LV2 extensions', conf.is_defined('LV2_EXTENDED')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) write_config_text('OGG', conf.is_defined('HAVE_OGG')) 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('PTW32 Semaphore', conf.is_defined('USE_PTW32_SEMAPHORE')) # write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) write_config_text('Translation', opts.nls) # write_config_text('Tranzport', opts.tranzport) write_config_text('Unit tests', conf.env['BUILD_TESTS']) write_config_text('Mac i386 Architecture', opts.generic) write_config_text('Mac ppc Architecture', opts.ppc) - write_config_text('Waves Backend', conf.env['BUILD_WAVESBACKEND']) write_config_text('Windows VST support', opts.windows_vst) write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE')) write_config_text('Windows key', opts.windows_key) + write_config_text('PortAudio Backend', conf.env['BUILD_PABACKEND']) + write_config_text('CoreAudio/Midi Backend',conf.env['BUILD_CORECRAPPITA']) + write_config_text('ALSA Backend', conf.env['BUILD_ALSABACKEND']) + write_config_text('Dummy backend', conf.env['BUILD_DUMMYBACKEND']) + write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) + 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']) @@ -1097,6 +1229,9 @@ const char* const ardour_config_info = "\\n\\ config_text.close () print('') + if Options.options.dist_target == 'mingw' or Options.options.dist_target == 'msvc': + create_resource_file(Options.options.program_name.lower()) + def build(bld): create_stored_revision() @@ -1115,10 +1250,10 @@ def build(bld): lwrcase_dirname = 'ardour' + bld.env['MAJOR'] 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' - + 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 @@ -1135,6 +1270,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')