X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=7e7fe013e81e37282453bf24846f341e85798b56;hb=10ed21a4987113f2debece87d81ba801991570e3;hp=a0b439e48c6f86a451f5696019dc0908c8ad20e0;hpb=6fc1f270137a06115a79c6089004174c5cab5ed7;p=ardour.git diff --git a/wscript b/wscript index a0b439e48c..7e7fe013e8 100644 --- a/wscript +++ b/wscript @@ -52,12 +52,9 @@ out = 'build' children = [ # optionally external libraries - 'libs/vamp-sdk', 'libs/qm-dsp', 'libs/vamp-plugins', - 'libs/taglib', 'libs/libltc', - 'libs/rubberband', # core ardour libraries 'libs/pbd', 'libs/midi++2', @@ -76,6 +73,10 @@ children = [ 'midi_maps', 'mcp', 'patchfiles', + 'headless', + # shared helper binaries (plugin-scanner, exec-wrapper) + 'libs/fst', + 'libs/vfork', ] i18n_children = [ @@ -171,11 +172,6 @@ def set_compiler_flags (conf,opt): if opt.gprofile: debug_flags = [ '-pg' ] - if opt.backtrace: - if opt.dist_target == 'auto': - if platform != 'darwin' and not is_clang: - debug_flags = [ '-rdynamic' ] - # Autodetect if opt.dist_target == 'auto': if platform == 'darwin': @@ -212,25 +208,7 @@ def set_compiler_flags (conf,opt): # compiler_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 platform == 'darwin': - # optimization_flags.extend ([ "-mcpu=7450", "-faltivec"]) - # to support g3s but still have some optimization for above - compiler_flags.extend ([ "-mcpu=G3", "-mtune=7450"]) - else: - compiler_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) - else: - compiler_flags.extend([ "-mcpu=750", "-mmultiple" ]) - compiler_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) - optimization_flags.extend (["-Os"]) - - elif ((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", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': # @@ -362,23 +340,9 @@ def set_compiler_flags (conf,opt): if conf.env['DEBUG_DENORMAL_EXCEPTION']: compiler_flags.append('-DDEBUG_DENORMAL_EXCEPTION') - if opt.universal: - if opt.generic: - print ('Specifying Universal and Generic builds at the same time is not supported') - sys.exit (1) - else: - if not Options.options.nocarbon: - compiler_flags.extend(("-arch", "i386", "-arch", "ppc")) - linker_flags.extend(("-arch", "i386", "-arch", "ppc")) - else: - compiler_flags.extend( - ("-arch", "x86_64", "-arch", "i386", "-arch", "ppc")) - linker_flags.extend( - ("-arch", "x86_64", "-arch", "i386", "-arch", "ppc")) - else: - if opt.generic: - compiler_flags.extend(('-arch', 'i386')) - linker_flags.extend(('-arch', 'i386')) + if opt.generic: + compiler_flags.extend(('-arch', 'i386')) + linker_flags.extend(('-arch', 'i386')) # # warnings flags @@ -405,6 +369,8 @@ def set_compiler_flags (conf,opt): if opt.nls: compiler_flags.append('-DENABLE_NLS') + compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"') + if opt.debug: conf.env.append_value('CFLAGS', debug_flags) conf.env.append_value('CXXFLAGS', debug_flags) @@ -412,6 +378,10 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CFLAGS', optimization_flags) conf.env.append_value('CXXFLAGS', optimization_flags) + if opt.backtrace: + if platform != 'darwin' and not is_clang and not Options.options.dist_target == 'mingw': + linker_flags += [ '-rdynamic' ] + conf.env.append_value('CFLAGS', compiler_flags) conf.env.append_value('CFLAGS', c_flags) conf.env.append_value('CXXFLAGS', compiler_flags) @@ -428,6 +398,8 @@ 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('--backtrace', action='store_true', default=True, dest='backtrace', @@ -439,10 +411,11 @@ def options(opt): opt.add_option('--depstack-root', type='string', default='~', dest='depstack_root', help='Directory/folder where dependency stack trees (gtk, a3) can be found (defaults to ~)') opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', - help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard,mingw]') + help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,tiger,leopard,mingw]') opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization', help='Build runtime checked assembler code (default)') 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') opt.add_option('--freebie', action='store_true', default=False, dest='freebie', @@ -459,6 +432,7 @@ def options(opt): help='Compile with support for LV2 (if Lilv+Suil is available)') opt.add_option('--no-lv2', action='store_false', dest='lv2', help='Do not compile with support for LV2') + opt.add_option('--lv2dir', type='string', help="install destination for builtin LV2 bundles [Default: LIBDIR/lv2]") opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst', help='Compile with support for linuxVST plugins') opt.add_option('--nls', action='store_true', default=True, dest='nls', @@ -484,8 +458,6 @@ def options(opt): help="Build a single executable for each unit test") #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 (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', @@ -575,6 +547,16 @@ def configure(conf): conf.env.append_value ('CXXFLAGS', '-DNO_PLUGIN_STATE') conf.define ('NO_PLUGIN_STATE', 1) + if Options.options.trx_build: + conf.define ('TRX_BUILD', 1) + + if Options.options.lv2dir: + conf.env['LV2DIR'] = Options.options.lv2dir + else: + conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'lv2') + + conf.env['LV2DIR'] = os.path.normpath(conf.env['LV2DIR']) + if sys.platform == 'darwin': # this is required, potentially, for anything we link and then relocate into a bundle @@ -647,20 +629,27 @@ def configure(conf): if Options.options.boost_sp_debug: conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') - conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", + # executing a test program is n/a when cross-compiling + if Options.options.dist_target != 'mingw': + 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, msg = 'Checking for boost library >= 1.39', okmsg = 'ok', errmsg = 'too old\nPlease install boost version 1.39 or higher.') - 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.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') - autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26') + autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=True) + autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True) + autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) + autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18, mandatory=True') + autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True) + autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0', mandatory=True) + autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26', mandatory=True) + autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.6', mandatory=True) + autowaf.check_pkg(conf, 'vamp-sdk', uselib_store='VAMPSDK', atleast_version='2.4', mandatory=True) + autowaf.check_pkg(conf, 'vamp-hostsdk', uselib_store='VAMPHOSTSDK', atleast_version='2.4', mandatory=True) + autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', mandatory=True) if Options.options.dist_target == 'mingw': Options.options.fpu_optimization = False @@ -668,7 +657,7 @@ def configure(conf): conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW') conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS') conf.env.append_value('CXXFLAGS', '-DCOMPILER_MINGW') - conf.env.append_value('LIB', 'pthreadGC2') + conf.env.append_value('LIB', 'pthread') # needed for at least libsmf conf.check_cc(function_name='htonl', header_name='winsock2.h', lib='ws2_32') conf.env.append_value('LIB', 'ws2_32') @@ -679,23 +668,28 @@ def configure(conf): # TODO put this only where it is needed conf.env.append_value('LIB', 'regex') - if Options.options.dist_target != 'mingw': - 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, - msg = 'Checking for boost library >= 1.39', - okmsg = 'ok', - errmsg = 'too old\nPlease install boost version 1.39 or higher.') - # Tell everyone that this is a waf build conf.env.append_value('CFLAGS', '-DWAF_BUILD') conf.env.append_value('CXXFLAGS', '-DWAF_BUILD') - # Set up waf environment and C defines opts = Options.options + + # (optionally) Adopt Microsoft-like convention that makes all non-explicitly exported + # symbols invisible (rather than doing this all over the wscripts in the src tree) + # + # This won't apply to MSVC but that hasn't been added as a target yet + # + # We can't do this till all tests are complete, since some fail if this is et. + if opts.exports_hidden: + conf.define ('EXPORT_VISIBILITY_HIDDEN', True) + if opts.internal_shared_libs: + conf.env.append_value ('CXXFLAGS', '-fvisibility=hidden') + conf.env.append_value ('CFLAGS', '-fvisibility=hidden') + else: + conf.define ('EXPORT_VISIBILITY_HIDDEN', False) + + # Set up waf environment and C defines if opts.phone_home: conf.define('PHONE_HOME', 1) conf.env['PHONE_HOME'] = True @@ -714,9 +708,10 @@ def configure(conf): if opts.windows_vst: conf.define('WINDOWS_VST_SUPPORT', 1) conf.env['WINDOWS_VST_SUPPORT'] = True - conf.env.append_value('CFLAGS', '-I' + Options.options.wine_include) - conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include) - autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True) + if not Options.options.dist_target == 'mingw': + conf.env.append_value('CFLAGS', '-I' + Options.options.wine_include) + conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include) + autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True) if opts.lxvst: if sys.platform == 'darwin': conf.env['LXVST_SUPPORT'] = False @@ -726,7 +721,6 @@ def configure(conf): conf.define('LXVST_SUPPORT', 1) conf.env['LXVST_SUPPORT'] = True conf.define('WINDOWS_KEY', opts.windows_key) - conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: conf.define('DEBUG_RT_ALLOC', 1) conf.env['DEBUG_RT_ALLOC'] = True @@ -764,7 +758,7 @@ const char* const ardour_config_info = "\\n\\ def write_config_text(title, val): autowaf.display_msg(conf, title, val) config_text.write(title + ': ') - config_text.write(str(val)) + config_text.write(str(val).replace ('"', '\\"')) config_text.write("\\n\\\n") write_config_text('Build documentation', conf.env['DOCS']) @@ -774,6 +768,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Strict compiler flags', conf.env['STRICT']) write_config_text('Internal Shared Libraries', conf.is_defined('INTERNAL_SHARED_LIBS')) 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('Architecture flags', opts.arch) write_config_text('Aubio', conf.is_defined('HAVE_AUBIO')) @@ -793,13 +788,11 @@ const char* const ardour_config_info = "\\n\\ 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('Rubberband', conf.is_defined('HAVE_RUBBERBAND')) 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('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', conf.is_defined('BUILD_WIIMOTE')) @@ -819,10 +812,7 @@ def build(bld): # add directories that contain only headers, to workaround an issue with waf if not bld.is_defined('USE_EXTERNAL_LIBS'): - bld.path.find_dir ('libs/vamp-sdk/vamp-sdk') bld.path.find_dir ('libs/libltc/ltc') - bld.path.find_dir ('libs/rubberband/rubberband') - bld.path.find_dir ('libs/taglib/taglib') bld.path.find_dir ('libs/evoral/evoral') bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol') bld.path.find_dir ('libs/timecode/timecode') @@ -830,6 +820,20 @@ def build(bld): bld.path.find_dir ('libs/ardour/ardour') bld.path.find_dir ('libs/pbd/pbd') + # set up target directories + lwrcase_dirname = 'ardour3' + + if bld.is_defined ('TRX_BUILD'): + 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 + bld.env['DATADIR'] = os.path.join(bld.env['DATADIR'], lwrcase_dirname) + # shared objects loaded at runtime go here (two aliases) + bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname) + bld.env['LIBDIR'] = bld.env['DLLDIR'] + autowaf.set_recursive() if sys.platform == 'darwin': @@ -843,7 +847,7 @@ def build(bld): for i in children: bld.recurse(i) - bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc') + bld.install_files (bld.env['SYSCONFDIR'], 'ardour_system.rc') if bld.env['RUN_TESTS']: bld.add_post_fun(test)