X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=561a2a4770078c2b40e58c5370da4e660fd7ef97;hb=c44e520d8ca1c4efe6af36d08cd3f86f12f712c2;hp=af08b5e06627670d867bb3908f8118708e2f9db6;hpb=db84f21ce0544f167c537a6826ce0a787b0f347e;p=ardour.git diff --git a/wscript b/wscript index af08b5e066..561a2a4770 100644 --- a/wscript +++ b/wscript @@ -8,8 +8,8 @@ import subprocess import sys # Variables for 'waf dist' -VERSION = '3.0alpha10' -APPNAME = 'Ardour' +VERSION = '3.0beta1a' +APPNAME = 'Ardour3' # Mandatory variables top = '.' @@ -45,8 +45,10 @@ i18n_children = [ if sys.platform != 'darwin': children += [ 'tools/sanity_check' ] + lxvst_default = True else: children += [ 'libs/appleutility' ] + lxvst_default = False # Version stuff @@ -180,7 +182,8 @@ def set_compiler_flags (conf,opt): # # ARCH_X86 means anything in the x86 family from i386 to x86_64 - # USE_X86_64_ASM is used to distingush 32 and 64 bit assembler + # the compile-time presence of the macro _LP64 is used to + # distingush 32 and 64 bit assembler # if (re.search ("(i[0-9]86|x86_64)", config[config_cpu]) != None): @@ -225,9 +228,6 @@ def set_compiler_flags (conf,opt): elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': optimization_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") - elif conf.env['build_target'] == 'x86_64': - optimization_flags.append ("-DUSE_X86_64_ASM") - debug_flags.append ("-DUSE_X86_64_ASM") 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)") @@ -242,18 +242,15 @@ def set_compiler_flags (conf,opt): # no VST on x86_64 # - if conf.env['build_target'] == 'x86_64' and opt.vst: + 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 --vst=0") + 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) if opt.lxvst: if conf.env['build_target'] == 'x86_64': - print("\n\n********************************************************") - print("* Building with 64Bit linuxVST support is experimental *") - print("********************************************************\n\n") conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT") else: conf.env.append_value('CXXFLAGS', "-DLXVST_32BIT") @@ -313,9 +310,14 @@ def set_compiler_flags (conf,opt): conf.env.append_value('LINKFLAGS', '-ldl') if opt.universal: - 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 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"]) # # warnings flags @@ -324,11 +326,6 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CFLAGS', "-Wall") conf.env.append_value('CXXFLAGS', [ '-Wall', '-Woverloaded-virtual']) - if opt.extra_warn: - flags = [ '-Wextra' ] - conf.env.append_value('CFLAGS', flags) - conf.env.append_value('CXXFLAGS', flags) - # # more boilerplate @@ -353,34 +350,37 @@ def set_compiler_flags (conf,opt): def options(opt): opt.load('compiler_c') opt.load('compiler_cxx') - autowaf.set_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('--arch', type='string', action='store', dest='arch', help='Architecture-specific compiler flags') + opt.add_option('--no-carbon', action='store_true', default=False, dest='nocarbon', + help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)') opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug', help='Compile with Boost shared pointer debugging') 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]') - opt.add_option('--extra-warn', action='store_true', default=False, dest='extra_warn', - help='Build with even more compiler warning flags') 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('--freedesktop', action='store_true', default=False, dest='freedesktop', help='Install MIME type, icons and .desktop file as per freedesktop.org standards') - opt.add_option('--freesound', action='store_true', default=False, dest='freesound', - help='Include Freesound database lookup') + 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('--no-freesound', action='store_false', default=True, dest='freesound', + help='Do not build with Freesound database support') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') - opt.add_option('--lv2', action='store_true', default=False, dest='lv2', + 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('--lxvst', action='store_true', default=True, dest='lxvst', + opt.add_option('--no-lv2', action='store_false', dest='lv2', + help='Do not compile with support for LV2') + opt.add_option('--lxvst', action='store_true', default=lxvst_default, dest='lxvst', help='Compile with support for linuxVST plugins') opt.add_option('--nls', action='store_true', default=True, dest='nls', help='Enable i18n (native language support) (default)') opt.add_option('--no-nls', action='store_false', dest='nls') - opt.add_option('--optimize', action='store_false', dest='debug') opt.add_option('--phone-home', action='store_false', default=False, dest='phone_home') opt.add_option('--stl-debug', action='store_true', default=False, dest='stl_debug', help='Build with debugging for the STL') @@ -394,8 +394,8 @@ def options(opt): help='Compile as universal binary (requires that external libraries are universal)') 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('--vst', action='store_true', default=False, dest='vst', - help='Compile with support for VST') + 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>