X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=1fce071465f2b046d2ac047c3c17ef401a3ac45f;hb=acf6c350726d32be7b2b5cacf778b23569cf339d;hp=ffe7aa89ec3012eb3a240ef6adba97d90918ac9c;hpb=c948806811e106cebc20b982aeebd8e43a934652;p=ardour.git diff --git a/wscript b/wscript index ffe7aa89ec..1fce071465 100644 --- a/wscript +++ b/wscript @@ -6,6 +6,7 @@ import commands import re import string import subprocess +import sys # Variables for 'waf dist' VERSION = '3.0pre0' @@ -26,6 +27,7 @@ children = [ 'libs/surfaces', 'libs/ardour', 'libs/gtkmm2ext', + 'libs/clearlooks-newer', 'gtk2_ardour' ] @@ -79,7 +81,7 @@ def create_stored_revision(): sys.exit(-1) try: - text = '#include \n' + text = '#include "ardour/svn_revision.h"\n' text += 'namespace ARDOUR { extern const char* svn_revision = \"' + rev + '\"; }\n' print 'Writing svn revision info to libs/ardour/svn_revision.cc' o = file('libs/ardour/svn_revision.cc', 'w') @@ -89,7 +91,6 @@ def create_stored_revision(): print 'Could not open libs/ardour/svn_revision.cc for writing\n' sys.exit(-1) - def set_compiler_flags (conf,opt): # # Compiler flags and other system-dependent stuff @@ -200,7 +201,7 @@ def set_compiler_flags (conf,opt): if conf.env['build_target'] == 'tiger' or conf.env['build_target'] == 'leopard': optimization_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); - libraries['core'].Append(LINKFLAGS= '-framework Accelerate') + conf.env.append_value('LINKFLAGS', "-framework Accelerate") 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") @@ -209,6 +210,8 @@ def set_compiler_flags (conf,opt): debug_flags.append ("-DUSE_X86_64_ASM") if build_host_supports_sse != 1: 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)" + if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', ccflags='-D_XOPEN_SOURCE=600') == False: + optimization_flags.append("-DNO_POSIX_MEMALIGN") # end optimization section @@ -231,13 +234,7 @@ def set_compiler_flags (conf,opt): conf.define ('IS_OSX', 1) # force tiger or later, to avoid issues on PPC which defaults # back to 10.1 if we don't tell it otherwise. - conf.env.append_value (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") - - if conf.env['build_target'] == 'leopard': - # need this to force build against the 10.4 SDK when building on later versions of OS X - # ideally this would be configurable, but lets just do that later when we need it - conf.env.append_value(CCFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk") - conf.env.append_value(LINKFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk") + conf.env.append_value('CCFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") else: conf.define ('IS_OSX', 0) @@ -317,6 +314,8 @@ def set_options(opt): help='Architecture-specific compiler flags') opt.add_option('--aubio', action='store_true', default=True, dest='aubio', help="Use Paul Brossier's aubio library for feature detection (if available)") + 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('--audiounits', action='store_true', default=False, dest='audiounits', help='Compile with Apple\'s AudioUnit library (experimental)') opt.add_option('--coreaudio', action='store_true', default=False, dest='coreaudio', @@ -353,8 +352,10 @@ def set_options(opt): help='Compile with support for 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', dest='windows_key', - help='Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key [Default: Mod4]', default='Mod4><\'') + for i in children: opt.sub_options(i) @@ -366,8 +367,107 @@ def configure(conf): create_stored_revision() autowaf.set_recursive() autowaf.configure(conf) + + if sys.platform == 'darwin': + # + # Define OSX as a uselib to use when compiling + # on Darwin to add all applicable flags at once + # + conf.env.append_value('CXXFLAGS_OSX', "-mmacosx-version-min=10.4") + conf.env.append_value('CCFLAGS_OSX', "-mmacosx-version-min=10.4") + conf.env.append_value('CXXFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk") + conf.env.append_value('CCFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk") + conf.env.append_value('LINKFLAGS_OSX', "-mmacosx-version-min=10.4") + 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', "-F/System/Library/Frameworks") + + conf.env.append_value('CXXFLAGS_OSX', "-msse") + conf.env.append_value('CCFLAGS_OSX', "-msse") + conf.env.append_value('CXXFLAGS_OSX', "-msse2") + conf.env.append_value('CCFLAGS_OSX', "-msse2") + # + # TODO: The previous sse flags NEED to be based + # off processor type. Need to add in a check + # for that. + # + + conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress']) + conf.env.append_value('LINKFLAGS_OSX', "-flat_namespace") + # + # The previous 2 flags avoid circular dependencies + # between libardour and libardour_cp on OS X. + # ld reported -undefined suppress as an unknown option + # in one of the tests ran, removing it for the moment + # + conf.env.append_value('CXXFLAGS_OSX', "-F/System/Library/Frameworks") + conf.env.append_value('CCFLAGS_OSX', "-F/System/Library/Frameworks") + + if Options.options.boost_sp_debug: + conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') + + if Options.options.gtkosx: + # + # Define Include Paths for GTKOSX + # + conf.env.append_value('CPPPATH_GTKOSX', "/usr/include/") + conf.env.append_value('CPPPATH_GTKOSX', "/usr/include/c++/4.0.0") + conf.env.append_value('CPPPATH_GTKOSX', "/usr/include/c++/4.0.0/i686-apple-darwin8/") + # + # TODO: Fix the above include path, it needs to be + # defined based off what is read in the configuration + # stage about the machine(PPC, X86, X86_64, etc.) + # + conf.env.append_value('CPPPATH_GTKOSX', "/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/") + # + # TODO: Likewise this needs to be defined not only + # based off the machine characteristics, but also + # based off the version of GCC being used. + # + conf.env.append_value('CPPPATH_GTKOSX', "/System/Library/Frameworks/") + conf.env.append_value('CXXFLAGS_GTKOSX', '-DTOP_MENUBAR') + conf.env.append_value('CXXFLAGS_GTKOSX', '-DGTKOSX') + conf.env.append_value('LINKFLAGS_GTKOSX', "-framework AppKit") + conf.env.append_value('LINKFLAGS_GTKOSX', "-Xlinker -headerpad") + conf.env.append_value('LINKFLAGS_GTKOSX', "-Xlinker 2048") + conf.env.append_value('CPPPATH_GTKOSX', "/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/") + # + # I had a note the previous was for MacTypes.h + # + + if Options.options.coreaudio: + #conf.env.append_value('LINKFLAGS_COREAUDIO', "-framework CoreAudioKit") + #conf.env.append_value('LINKFLAGS_COREAUDIO', "-framework AudioToolbox") + #conf.env.append_value('LINKFLAGS_COREAUDIO', "-framework CoreServices") + conf.check_cc (header_name = '/System/Library/Frameworks/CoreAudio.framework/Headers/CoreAudio.h', + define_name = 'HAVE_COREAUDIO', linkflags = ['-framework', 'CoreAudio']) + conf.check_cxx (header_name = '/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h', + linkflags = [ '-framework', 'AudioToolbox' ]) + conf.check_cc (header_name = '/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h', + linkflags = ['-framework', 'CoreFoundation']) + conf.check_cc (header_name = '/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h', + linkflags = ['-framework', 'CoreServices']) + # + # TODO: For some reason the above doesn't seem to be correctly adding the + # the link flags, so we will add them manually. + # + conf.env.append_value('LINKFLAGS_COREAUDIO', ['-framework', 'CoreServices']) + conf.env.append_value('LINKFLAGS_COREAUDIO', ['-framework', 'CoreFoundation']) + conf.env.append_value('LINKFLAGS_COREAUDIO', ['-framework', 'AudioToolbox']) + conf.env.append_value('LINKFLAGS_COREAUDIO', ['-framework', 'CoreAudio']) + + if Options.options.audiounits: + #conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DHAVE_AUDIOUNITS") + conf.env.append_value('LINKFLAGS_AUDIOUNITS', "-framework AudioToolbox") + conf.env.append_value('LINKFLAGS_AUDIOUNITS', "-framework CoreServices") + conf.check_cc (header_name = '/System/Library/Frameworks/AudioUnit.framework/Headers/AudioUnit.h', + define_name = 'HAVE_AUDIOUNITS', linkflags = [ '-framework', 'AudioUnit' ]) + autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2') autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0') + if sys.platform == 'darwin': + sub_config_and_use(conf, 'libs/appleutility') for i in children: sub_config_and_use(conf, i) @@ -398,6 +498,8 @@ def configure(conf): autowaf.display_msg(conf, 'GtkOSX', opts.gtkosx) if opts.gtkosx: conf.define ('GTKOSX', 1) + if opts.coreaudio: + conf.define ('COREAUDIO', 1) autowaf.display_msg(conf, 'LV2 Support', bool(conf.env['HAVE_SLV2'])) autowaf.display_msg(conf, 'Rubberband', bool(conf.env['HAVE_RUBBERBAND'])) autowaf.display_msg(conf, 'Samplerate', bool(conf.env['HAVE_SAMPLERATE'])) @@ -416,9 +518,9 @@ def configure(conf): autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote) if opts.wiimote: conf.define('WIIMOTE',1) - autowaf.display_msg(conf, 'Windows Key', opts.windows_key) if opts.windows_key: conf.define('WINDOWS_KEY', opts.windows_key) + autowaf.display_msg(conf, 'Windows Key', opts.windows_key) set_compiler_flags (conf, Options.options) @@ -427,9 +529,34 @@ def configure(conf): def build(bld): autowaf.set_recursive() + if sys.platform == 'darwin': + bld.add_subdirs('libs/appleutility') for i in children: bld.add_subdirs(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.new_task_gen('subst') + obj.source = 'ardour.rc.in' + obj.target = 'ardour_system.rc' + obj.dict = rc_subst_dict + obj.install_path = '${CONFIGDIR}/ardour3' + def i18n(bld): bld.recurse (i18n_children)