X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=7a3aff8a9aeb2eeadfe1fbc756b67e38327c4132;hb=ca697ee768cc61c1dd31256c8bd6c49d845af2da;hp=40f5274d340c14b680cbdc39555fa62173ea0e4d;hpb=2a24e01aa898e85fcf58daf9931aaf1083d7c550;p=ardour.git diff --git a/wscript b/wscript index 40f5274d34..7a3aff8a9a 100644 --- a/wscript +++ b/wscript @@ -8,7 +8,7 @@ import subprocess import sys # Variables for 'waf dist' -VERSION = '3.0beta3' +VERSION = '3.0rc2' APPNAME = 'Ardour3' # Mandatory variables @@ -23,6 +23,7 @@ children = [ 'libs/qm-dsp', 'libs/vamp-plugins', 'libs/taglib', + 'libs/libltc', 'libs/rubberband', 'libs/surfaces', 'libs/panners', @@ -35,6 +36,7 @@ children = [ 'templates', 'export', 'midi_maps', + 'mcp', 'manual' ] @@ -44,18 +46,21 @@ i18n_children = [ 'libs/gtkmm2ext', ] -if sys.platform != 'darwin': +if sys.platform == 'linux2': children += [ 'tools/sanity_check' ] lxvst_default = True -else: +elif sys.platform == 'darwin': children += [ 'libs/appleutility' ] lxvst_default = False +else: + lxvst_default = False # Version stuff def fetch_svn_revision (path): - cmd = "LANG= svn info " + path + " | awk '/^Revision:/ { print $2}'" - return subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() + cmd = "svnversion | cut -d: -f1" + output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].decode(sys.stdout.encoding) + return output.rstrip(os.linesep) def fetch_gcc_version (CC): cmd = "LANG= %s --version" % CC @@ -65,15 +70,18 @@ def fetch_gcc_version (CC): return version def fetch_git_revision (path): - cmd = "LANG= git log --abbrev HEAD^..HEAD " + path + cmd = "LANG= git log --abbrev HEAD^..HEAD" output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() o = output[0].decode('utf-8') rev = o.replace ("commit", "git")[0:10] + cmd = "LANG= git log --abbrev -n1 --grep 'git-svn-id'" + output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() for line in output: try: if "git-svn-id" in line: line = line.split('@')[1].split(' ') rev = line[0] + break except: pass return rev @@ -105,7 +113,7 @@ def create_stored_revision(): try: text = '#include "ardour/svn_revision.h"\n' text += 'namespace ARDOUR { const char* svn_revision = \"%s\"; }\n' % rev - print('Writing svn revision info to libs/ardour/svn_revision.cc') + print('Writing svn revision info to libs/ardour/svn_revision.cc using ' + rev) o = open('libs/ardour/svn_revision.cc', 'w') o.write(text) o.close() @@ -122,52 +130,60 @@ def set_compiler_flags (conf,opt): optimization_flags = [] debug_flags = [] - # guess at the platform, used to define compiler flags - - config_guess = os.popen("tools/config.guess").read()[:-1] - - config_cpu = 0 - config_arch = 1 - config_kernel = 2 - config_os = 3 - config = config_guess.split ("-") + u = os.uname () + cpu = u[4] + platform = u[0].lower() + version = u[2] + is_clang = conf.env['CXX'][0].endswith('clang++') if opt.gprofile: debug_flags = [ '-pg' ] else: - if config[config_arch] != 'apple': + if platform != 'darwin' and not is_clang: debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf! # Autodetect if opt.dist_target == 'auto': - if config[config_arch] == 'apple': + if platform == 'darwin': # The [.] matches to the dot after the major version, "." would match any character - if re.search ("darwin[0-7][.]", config[config_kernel]) != None: + if re.search ("^[0-7][.]", version) != None: conf.env['build_target'] = 'panther' - elif re.search ("darwin8[.]", config[config_kernel]) != None: + elif re.search ("^8[.]", version) != None: conf.env['build_target'] = 'tiger' - else: + elif re.search ("^9[.]", version) != None: conf.env['build_target'] = 'leopard' + elif re.search ("^10[.]", version) != None: + conf.env['build_target'] = 'snowleopard' + else: + conf.env['build_target'] = 'lion' else: - if re.search ("x86_64", config[config_cpu]) != None: + if re.search ("x86_64", cpu) != None: conf.env['build_target'] = 'x86_64' - elif re.search("i[0-5]86", config[config_cpu]) != None: + elif re.search("i[0-5]86", cpu) != None: conf.env['build_target'] = 'i386' - elif re.search("powerpc", config[config_cpu]) != None: + elif re.search("powerpc", cpu) != None: conf.env['build_target'] = 'powerpc' else: conf.env['build_target'] = 'i686' else: conf.env['build_target'] = opt.dist_target - if config[config_cpu] == 'powerpc' and conf.env['build_target'] != 'none': + if conf.env['build_target'] == 'snowleopard': + # + # stupid OS X 10.6 has a bug in math.h that prevents llrint and friends + # from being visible. + # + debug_flags.append ('-U__STRICT_ANSI__') + optimization_flags.append ('-U__STRICT_ANSI__') + + if cpu == 'powerpc' and conf.env['build_target'] != 'none': # # Apple/PowerPC optimization options # # -mcpu=7450 does not reliably work with gcc 3.* # if opt.dist_target == 'panther' or opt.dist_target == 'tiger': - if config[config_arch] == 'apple': + if platform == 'darwin': # optimization_flags.extend ([ "-mcpu=7450", "-faltivec"]) # to support g3s but still have some optimization for above optimization_flags.extend ([ "-mcpu=G3", "-mtune=7450"]) @@ -178,7 +194,7 @@ def set_compiler_flags (conf,opt): optimization_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) optimization_flags.extend (["-Os"]) - elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and conf.env['build_target'] != 'none': + elif ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': # @@ -187,11 +203,11 @@ def set_compiler_flags (conf,opt): # distingush 32 and 64 bit assembler # - if (re.search ("(i[0-9]86|x86_64)", config[config_cpu]) != None): + if (re.search ("(i[0-9]86|x86_64)", cpu) != None): debug_flags.append ("-DARCH_X86") optimization_flags.append ("-DARCH_X86") - if config[config_kernel] == 'linux' : + if platform == 'linux' : # # determine processor flags via /proc/cpuinfo @@ -209,12 +225,12 @@ def set_compiler_flags (conf,opt): if "3dnow" in x86_flags: optimization_flags.append ("-m3dnow") - if config[config_cpu] == "i586": + if cpu == "i586": optimization_flags.append ("-march=i586") - elif config[config_cpu] == "i686": + elif cpu == "i686": optimization_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: optimization_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) @@ -222,7 +238,7 @@ def set_compiler_flags (conf,opt): # optimization section if conf.env['FPU_OPTIMIZATION']: - if conf.env['build_target'] == 'tiger' or conf.env['build_target'] == 'leopard': + if sys.platform == 'darwin': optimization_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); conf.env.append_value('LINKFLAGS', "-framework Accelerate") @@ -232,11 +248,6 @@ def set_compiler_flags (conf,opt): 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)") - # check this even if we aren't using FPU optimization - if not conf.is_defined('HAVE_POSIX_MEMALIGN'): - optimization_flags.append("-DNO_POSIX_MEMALIGN") - debug_flags.append("-DNO_POSIX_MEMALIGN") - # end optimization section # @@ -270,9 +281,9 @@ def set_compiler_flags (conf,opt): conf.define ('IS_OSX', 0) # - # save off guessed arch element in an env + # save off CPU element in an env # - conf.define ('CONFIG_ARCH', config[config_arch]) + conf.define ('CONFIG_ARCH', cpu) # # ARCH="..." overrides all @@ -315,27 +326,50 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CXXFLAGS', '-DDEBUG_DENORMAL_EXCEPTION') if opt.universal: - if not Options.options.nocarbon: - conf.env.append_value('CFLAGS', ["-arch", "i386", "-arch", "ppc"]) - conf.env.append_value('CXXFLAGS', ["-arch", "i386", "-arch", "ppc"]) - conf.env.append_value('LINKFLAGS', ["-arch", "i386", "-arch", "ppc"]) + if opt.generic: + print ('Specifying Universal and Generic builds at the same time is not supported') + sys.exit (1) else: - conf.env.append_value('CFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) - conf.env.append_value('CXXFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) - conf.env.append_value('LINKFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) + if not Options.options.nocarbon: + conf.env.append_value('CFLAGS', ["-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('CXXFLAGS', ["-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('LINKFLAGS', ["-arch", "i386", "-arch", "ppc"]) + else: + conf.env.append_value('CFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('CXXFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('LINKFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) + else: + if opt.generic: + conf.env.append_value('CFLAGS', ['-arch', 'i386']) + conf.env.append_value('CXXFLAGS', ['-arch', 'i386']) + conf.env.append_value('LINKFLAGS', ['-arch', 'i386']) # # warnings flags # - conf.env.append_value('CFLAGS', "-Wall") - conf.env.append_value('CXXFLAGS', [ '-Wall', '-Woverloaded-virtual']) + conf.env.append_value('CFLAGS', [ '-Wall', + '-Wpointer-arith', + '-Wcast-qual', + '-Wcast-align', + '-Wstrict-prototypes', + '-Wmissing-prototypes' + ]) + + conf.env.append_value('CXXFLAGS', [ '-Wall', + '-Wpointer-arith', + '-Wcast-qual', + '-Wcast-align', + '-Woverloaded-virtual' + ]) # # more boilerplate # + conf.env.append_value('CFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED') + conf.env.append_value('CXXFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED') conf.env.append_value('CFLAGS', '-D_LARGEFILE64_SOURCE') conf.env.append_value('CFLAGS', '-D_FILE_OFFSET_BITS=64') conf.env.append_value('CXXFLAGS', '-D_LARGEFILE64_SOURCE') @@ -397,23 +431,25 @@ def options(opt): help='Raise a floating point exception if a denormal is detected') opt.add_option('--test', action='store_true', default=False, dest='build_tests', help="Build unit tests") - opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport', - help='Compile with support for Frontier Designs Tranzport (if libusb is available)') + #opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport', + # help='Compile with support for Frontier Designs Tranzport (if libusb is available)') opt.add_option('--universal', action='store_true', default=False, dest='universal', - help='Compile as universal binary (requires that external libraries are universal)') + help='Compile as universal binary (OS X ONLY, requires that external libraries are universal)') + opt.add_option('--generic', action='store_true', default=False, dest='generic', + help='Compile with -arch i386 (OS X ONLY)') opt.add_option('--versioned', action='store_true', default=False, dest='versioned', help='Add revision information to executable name inside the build directory') opt.add_option('--windows-vst', action='store_true', default=False, dest='windows_vst', help='Compile with support for Windows VST') - opt.add_option('--wiimote', action='store_true', default=False, dest='wiimote', - help='Build the wiimote control surface') opt.add_option('--windows-key', type='string', action='store', dest='windows_key', default='Mod4><\'') opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='', help='directory where Boost header files can be found') opt.add_option('--also-include', type='string', action='store', dest='also_include', default='', - help='additional include directory where header files can be found') + help='additional include directory where header files can be found (split multiples with commas)') + opt.add_option('--also-libdir', type='string', action='store', dest='also_libdir', default='', + help='additional include directory where shared libraries can be found (split multiples with commas)') opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows', help='directory where Wine\'s Windows header files can be found') opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm', @@ -428,15 +464,6 @@ def sub_config_and_use(conf, name, has_objects = True): def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') - if not Options.options.noconfirm: - print ('\n\nThis is a beta version of Ardour 3.0.\n\n' + - 'You are respectfully requested NOT to ask for assistance with build issues\n' + - 'and not to report issues with Ardour 3.0 on the forums at ardour.org.\n\n' + - 'Please use IRC, the bug tracker and/or the ardour mailing lists (-dev or -user)\n\n' + - 'Thanks for your co-operation with our development process.\n\n' + - 'Press Enter to continue.\n') - sys.stdin.readline() - create_stored_revision() conf.env['VERSION'] = VERSION conf.line_just = 52 autowaf.set_recursive() @@ -449,15 +476,56 @@ def configure(conf): print('Please use a different version or re-configure with --debug') exit (1) + # libintl may or may not be trivially locatable. On OS X this is always + # true. On Linux it will depend on whether we're on a normal Linux distro, + # in which case libintl.h is going to be available in /usr/include and + # the library itself is part of glibc, or on a bare-bones build system + # where we need to pick it up from the GTK dependency stack. + # + user_gtk_root = os.path.expanduser ('~/gtk/inst') + pkg_config_path = os.getenv('PKG_CONFIG_PATH') + if os.path.isfile ('/usr/include/libintl.h'): + # libintl is part of the system., so use it + autowaf.display_msg(conf, 'Will reply on libintl built into libc', 'yes') + else: + if (pkg_config_path is not None): + # told to search for pkgconfig files + if pkg_config_path.find (user_gtk_root) >= 0: + # told to search user_gtk_root + prefinclude = ''.join ([ '-I', user_gtk_root + '/include']) + preflib = ''.join ([ '-L', user_gtk_root + '/lib']) + conf.env.append_value('CFLAGS', [ prefinclude ]) + conf.env.append_value('CXXFLAGS', [prefinclude ]) + conf.env.append_value('LINKFLAGS', [ preflib ]) + conf.define ('NEED_INTL', 1) + autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ' + user_gtk_root, 'yes') + else: + print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH does not include ', user_gtk_root, '- this needs fixing before the build can continue') + sys.exit (-1) + else: + print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH is not set - this needs fixing before the build can continue') + + + user_ardour_root = os.path.expanduser ('~/a3/inst') + if pkg_config_path is not None and os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0: + # XXXX hack hack hack + prefinclude = ''.join ([ '-I', user_ardour_root + '/include']) + preflib = ''.join ([ '-L', user_ardour_root + '/lib']) + conf.env.append_value('CFLAGS', [ prefinclude ]) + conf.env.append_value('CXXFLAGS', [prefinclude ]) + conf.env.append_value('LINKFLAGS', [ preflib ]) + 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 sys.platform == 'darwin': # this is required, potentially, for anything we link and then relocate into a bundle - conf.env.append_value('LINKFLAGS', [ '-Xlinker', '-headerpad', '-Xlinker', '2048']) + conf.env.append_value('LINKFLAGS', [ '-Xlinker', '-headerpad_max_install_names' ]) conf.define ('HAVE_COREAUDIO', 1) conf.define ('AUDIOUNIT_SUPPORT', 1) - if not Options.options.nocarbon: - conf.define ('WITH_CARBON', 1) + if not Options.options.freebie: conf.define ('AU_STATE_SUPPORT', 1) @@ -465,8 +533,6 @@ def configure(conf): conf.define ('TOP_MENUBAR',1) conf.define ('GTKOSX',1) - conf.env.append_value('CXXFLAGS_APPLEUTILITY', '-I../libs') - # # Define OSX as a uselib to use when compiling # on Darwin to add all applicable flags at once # @@ -475,10 +541,13 @@ def configure(conf): conf.env.append_value('CXXFLAGS_OSX', '-mmacosx-version-min=10.4') conf.env.append_value('CFLAGS_OSX', '-mmacosx-version-min=10.4') + # 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 + # way. + # #conf.env.append_value('CXXFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk") #conf.env.append_value('CFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk") - #conf.env.append_value('LINKFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk") - + #conf.env.append_value('LINKFLAGS_OSX', "-sysroot /Developer/SDKs/MacOSX10.4u.sdk") #conf.env.append_value('LINKFLAGS_OSX', "-sysroot /Developer/SDKs/MacOSX10.4u.sdk") conf.env.append_value('CXXFLAGS_OSX', "-msse") @@ -503,14 +572,17 @@ def configure(conf): conf.env.append_value('LINKFLAGS_OSX', ['-flat_namespace']) conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAUDIOUNIT_SUPPORT") - conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit']) + conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'AudioToolbox', '-framework', 'AudioUnit']) conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Cocoa']) if not Options.options.freebie: conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT") - if not Options.options.nocarbon: + + if re.search ("^[1-9][0-9]\.", os.uname()[2]) == None and not Options.options.nocarbon: conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON") conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon']) + else: + print ('No Carbon support available for this build\n') if Options.options.boost_include != '': conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include) @@ -519,7 +591,8 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-I' + Options.options.also_include) conf.env.append_value('CFLAGS', '-I' + Options.options.also_include) - autowaf.check_header(conf, 'cxx', 'boost/signals2.hpp', mandatory = True) + if Options.options.also_libdir != '': + conf.env.append_value('LDFLAGS', '-L' + Options.options.also_libdir) if Options.options.boost_sp_debug: conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') @@ -533,21 +606,14 @@ def configure(conf): okmsg = 'ok', errmsg = 'too old\nPlease install boost version 1.39 or higher.') - autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2') - autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0') + autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0') autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2') + autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0') - for i in children: - sub_config_and_use(conf, i) - - # Fix utterly braindead FLAC include path to not smash assert.h - conf.env['INCLUDES_FLAC'] = [] - - conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='-ldl', uselib_store='DL') - conf.check_cc(function_name='curl_global_init', header_name='curl/curl.h', linkflags='-lcurl', uselib_store='CURL') + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') # Tell everyone that this is a waf build @@ -570,8 +636,8 @@ def configure(conf): conf.env['ENABLE_NLS'] = True if opts.build_tests: conf.env['BUILD_TESTS'] = opts.build_tests - if opts.tranzport: - conf.env['TRANZPORT'] = 1 + #if opts.tranzport: + # conf.env['TRANZPORT'] = 1 if opts.windows_vst: conf.define('WINDOWS_VST_SUPPORT', 1) conf.env['WINDOWS_VST_SUPPORT'] = True @@ -583,9 +649,6 @@ def configure(conf): conf.env['LXVST_SUPPORT'] = True if bool(conf.env['JACK_SESSION']): conf.define('HAVE_JACK_SESSION', 1) - if opts.wiimote: - conf.define('WIIMOTE', 1) - conf.env['WIIMOTE'] = True conf.define('WINDOWS_KEY', opts.windows_key) conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: @@ -597,11 +660,17 @@ def configure(conf): if opts.denormal_exception: conf.define('DEBUG_DENORMAL_EXCEPTION', 1) conf.env['DEBUG_DENORMAL_EXCEPTION'] = True - if not conf.is_defined('HAVE_CPPUNIT'): - conf.env['BUILD_TESTS'] = False + if opts.build_tests: + autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True) set_compiler_flags (conf, Options.options) + for i in children: + sub_config_and_use(conf, i) + + # Fix utterly braindead FLAC include path to not smash assert.h + conf.env['INCLUDES_FLAC'] = [] + config_text = open('libs/ardour/config_text.cc', "w") config_text.write('''#include "ardour/ardour.h" namespace ARDOUR { @@ -635,7 +704,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('JACK session support', conf.is_defined('JACK_SESSION')) 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 state support', conf.is_defined('HAVE_NEW_LILV')) 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')) @@ -644,27 +712,32 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Samplerate', conf.is_defined('HAVE_SAMPLERATE')) # write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) write_config_text('Translation', opts.nls) - write_config_text('Tranzport', opts.tranzport) +# write_config_text('Tranzport', opts.tranzport) write_config_text('Unit tests', conf.env['BUILD_TESTS']) write_config_text('Universal binary', opts.universal) + write_config_text('Generic x86 CPU', opts.generic) write_config_text('Windows VST support', opts.windows_vst) - write_config_text('Wiimote support', opts.wiimote) + write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE')) write_config_text('Windows key', opts.windows_key) 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']) config_text.write ('";\n}\n') config_text.close () print('') def build(bld): + create_stored_revision() + # add directories that contain only headers, to workaround an issue with waf bld.path.find_dir ('libs/evoral/evoral') bld.path.find_dir ('libs/vamp-sdk/vamp-sdk') bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol') bld.path.find_dir ('libs/timecode/timecode') + bld.path.find_dir ('libs/libltc/ltc') bld.path.find_dir ('libs/rubberband/rubberband') bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext') bld.path.find_dir ('libs/ardour/ardour') @@ -676,28 +749,7 @@ def build(bld): for i in children: bld.recurse(i) - # ideally, we'd like to use the OS-provided MIDI API - # for default ports. that doesn't work on at least - # Fedora (Nov 9th, 2009) so use JACK MIDI on linux. - - if sys.platform == 'darwin': - rc_subst_dict = { - 'MIDITAG' : 'control', - 'MIDITYPE' : 'coremidi', - 'JACK_INPUT' : 'auditioner' - } - else: - rc_subst_dict = { - 'MIDITAG' : 'control', - 'MIDITYPE' : 'jack', - 'JACK_INPUT' : 'auditioner' - } - - obj = bld(features = 'subst') - obj.source = 'ardour.rc.in' - obj.target = 'ardour_system.rc' - obj.dict = rc_subst_dict - obj.install_path = '${SYSCONFDIR}/ardour3' + bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc') def i18n(bld): bld.recurse (i18n_children) @@ -710,3 +762,4 @@ def i18n_po(bld): def i18n_mo(bld): bld.recurse (i18n_children) +