X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=bf1a1024da3b3f96ca9cf30a2d382c72f5a9ab3b;hb=f1fd7f6fa47f0b86a7097a32e03129102ae0611a;hp=19fb5fb6697f0334c91727e86c9f71517cdabbdf;hpb=9f7f0f79a3e8776164e7ae73eb4f40fce11e6539;p=ardour.git diff --git a/wscript b/wscript index 19fb5fb669..bf1a1024da 100644 --- a/wscript +++ b/wscript @@ -6,6 +6,7 @@ import re import string import subprocess import sys +import glob # Variables for 'waf dist' VERSION = '3.0pre0' @@ -24,14 +25,16 @@ children = [ 'libs/taglib', 'libs/rubberband', 'libs/surfaces', + 'libs/timecode', 'libs/ardour', 'libs/gtkmm2ext', 'libs/clearlooks-newer', 'libs/audiographer', - 'gtk2_ardour' + 'libs/gnomecanvas', + 'gtk2_ardour', + 'templates' ] - i18n_children = [ 'gtk2_ardour', 'libs/ardour' @@ -41,7 +44,7 @@ i18n_children = [ def fetch_svn_revision (path): cmd = "LANG= svn info " + path + " | awk '/^Revision:/ { print $2}'" - return subprocess.Popen(cmd, shell=True, stderr=sub.STDOUT, stdout=sub.PIPE).communicate()[0] + return subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() def fetch_gcc_version (): cmd = "LANG= gcc --version" @@ -90,7 +93,7 @@ def create_stored_revision(): try: text = '#include "ardour/svn_revision.h"\n' - text += 'namespace ARDOUR { const char* svn_revision = \"' + rev + '\"; }\n' + text += 'namespace ARDOUR { const char* svn_revision = \"%s\"; }\n' % rev print('Writing svn revision info to libs/ardour/svn_revision.cc') o = open('libs/ardour/svn_revision.cc', 'w') o.write(text) @@ -106,10 +109,7 @@ def set_compiler_flags (conf,opt): build_host_supports_sse = False optimization_flags = [] - if opt.gprofile: - debug_flags = [ '-pg' ] - else: - debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf! + debug_flags = [] # guess at the platform, used to define compiler flags @@ -123,6 +123,12 @@ def set_compiler_flags (conf,opt): autowaf.display_msg(conf, "System Triple", config_guess) + if opt.gprofile: + debug_flags = [ '-pg' ] + else: + if config[config_arch] != 'apple': + debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf! + # Autodetect if opt.dist_target == 'auto': if config[config_arch] == 'apple': @@ -307,13 +313,13 @@ def set_compiler_flags (conf,opt): # more boilerplate # - conf.env.append_value('CCFLAGS', [ '-D_LARGEFILE64_SOURCE', '-D_LARGEFILE_SOURCE' ]) - conf.env.append_value('CCFLAGS', [ '-D_FILE_OFFSET_BITS=64', '-D_FILE_OFFSET_BITS=64' ]) - conf.env.append_value('CXXFLAGS', [ '-D_LARGEFILE64_SOURCE', '-D_LARGEFILE_SOURCE' ]) - conf.env.append_value('CXXFLAGS', [ '-D_FILE_OFFSET_BITS=64', '-D_FILE_OFFSET_BITS=64' ]) + conf.env.append_value('CCFLAGS', '-D_LARGEFILE64_SOURCE') + conf.env.append_value('CCFLAGS', '-D_FILE_OFFSET_BITS=64') + conf.env.append_value('CXXFLAGS', '-D_LARGEFILE64_SOURCE') + conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64') - conf.env.append_value('CXXFLAGS', [ '-D__STDC_LIMIT_MACROS', '-D__STDC_LIMIT_MACROS' ]) - conf.env.append_value('CXXFLAGS', [ '-D__STDC_FORMAT_MACROS', '-D__STDC_FORMAT_MACROS' ]) + conf.env.append_value('CXXFLAGS', '-D__STDC_LIMIT_MACROS') + conf.env.append_value('CXXFLAGS', '-D__STDC_FORMAT_MACROS') if opt.nls: conf.env.append_value('CXXFLAGS', '-DENABLE_NLS') @@ -332,10 +338,6 @@ def set_options(opt): help='Architecture-specific compiler flags') 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') - opt.add_option('--coreaudio', action='store_true', default=False, dest='coreaudio', - help='Compile with Apple\'s CoreAudio library') 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', @@ -349,8 +351,6 @@ def set_options(opt): help='Include Freesound database lookup') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') - opt.add_option('--gtkosx', action='store_true', default=False, dest='gtkosx', - help='Compile for use with GTK-OSX, not GTK-X11') opt.add_option('--lv2', action='store_true', default=False, dest='lv2', help='Compile with support for LV2 (if slv2 is available)') opt.add_option('--nls', action='store_true', default=True, dest='nls', @@ -372,9 +372,12 @@ def set_options(opt): 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><\'') - + help='X Modifier(s) (Mod1,Mod2, etc) for the Windows key (X11 builds only). ' + + 'Multiple modifiers must be separated by \'><\'') + 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('--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') for i in children: opt.sub_options(i) @@ -397,19 +400,29 @@ def configure(conf): exit (1) if sys.platform == 'darwin': + + conf.define ('AUDIOUNITS', 1) + conf.define ('AU_STATE_SUPPORT', 1) + conf.define ('COREAUDIO', 1) + conf.define ('GTKOSX', 1) + 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 # - 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('CXXFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040') + conf.env.append_value('CCFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040') + 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('LINKFLAGS_OSX', "-sysroot /Developer/SDKs/MacOSX10.4u.sdk") - conf.env.append_value('LINKFLAGS_OSX', "-F/System/Library/Frameworks") + #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', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk") + + #conf.env.append_value('LINKFLAGS_OSX', "-sysroot /Developer/SDKs/MacOSX10.4u.sdk") conf.env.append_value('CXXFLAGS_OSX', "-msse") conf.env.append_value('CCFLAGS_OSX', "-msse") @@ -420,71 +433,33 @@ def configure(conf): # off processor type. Need to add in a check # for that. # + conf.env.append_value('CXXFLAGS_OSX', '-F/System/LibraryFrameworks') + conf.env.append_value('CXXFLAGS_OSX', '-F/Library/Frameworks') - conf.env.append_value('CPPPATH_OSX', "/System/Library/Frameworks/") - conf.env.append_value('CPPPATH_OSX', "/usr/include/") - conf.env.append_value('CPPPATH_OSX', "/usr/include/c++/4.0.0") - conf.env.append_value('CPPPATH_OSX', "/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_OSX', "/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('FRAMEWORK_OSX', ['CoreFoundation']) + conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'AppKit']) + conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudio']) + conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreFoundation']) + conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreServices']) - 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") + conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress' ]) + conf.env.append_value('LINKFLAGS_OSX', '-flat_namespace') - # GTKOSX only builds on darwin anyways - if Options.options.gtkosx: - # - # Define Include Paths for GTKOSX - # - 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/") + 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/") - if Options.options.coreaudio: - conf.check_cc (header_name = '/System/Library/Frameworks/CoreAudio.framework/Headers/CoreAudio.h', - define_name = 'HAVE_COREAUDIO', linkflags = ['-framework CoreAudio'], - uselib_store="COREAUDIO") - conf.check_cxx (header_name = '/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h', - linkflags = [ '-framework AudioToolbox' ], uselib_store="COREAUDIO") - conf.check_cc (header_name = '/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h', - linkflags = ['-framework CoreServices'], uselib_store="COREAUDIO") - - if Options.options.audiounits: - #conf.env.append_value('CXXFLAGS_AUDIOUNIT', "-DHAVE_AUDIOUNITS") - conf.env.append_value('FRAMEWORK_AUDIOUNIT', ['AudioToolbox']) - conf.env.append_value('FRAMEWORK_AUDIOUNIT', ['CoreServices']) - conf.check_cc (header_name = '/System/Library/Frameworks/AudioUnit.framework/Headers/AudioUnit.h', - define_name = 'HAVE_AUDIOUNITS', linkflags = [ '-framework AudioUnit' ], - uselib_store="AUDIOUNIT") + conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DHAVE_AUDIOUNITS") + conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit']) - if Options.options.boost_sp_debug: - conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') + if Options.options.boost_include != '': + conf.env.append_value('CPPPATH', Options.options.boost_include) autowaf.check_header(conf, 'boost/signals2.hpp', mandatory = True) - autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION") + if Options.options.boost_sp_debug: + conf.env.append_value('CXXFLAGS_BOOST', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') + + autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION", mandatory = False) conf.check_cc(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", execute = "1", @@ -497,6 +472,7 @@ def configure(conf): 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, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') if sys.platform == 'darwin': sub_config_and_use(conf, 'libs/appleutility') @@ -509,9 +485,6 @@ def configure(conf): 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') - if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', ccflags='-D_XOPEN_SOURCE=600') == False: - conf.env['HAVE_POSIX_MEMALIGN'] = True - # Tell everyone that this is a waf build conf.env.append_value('CCFLAGS', '-DWAF_BUILD') @@ -526,13 +499,8 @@ def configure(conf): autowaf.display_msg(conf, 'Build Target', conf.env['build_target']) autowaf.display_msg(conf, 'Architecture flags', opts.arch) autowaf.display_msg(conf, 'Aubio', bool(conf.env['HAVE_AUBIO'])) - autowaf.display_msg(conf, 'AudioUnits', opts.audiounits) autowaf.display_msg(conf, 'CoreAudio', bool(conf.env['HAVE_COREAUDIO'])) autowaf.display_msg(conf, 'FLAC', bool(conf.env['HAVE_FLAC'])) - if bool(conf.env['HAVE_COREAUDIO']): - conf.define ('COREAUDIO', 1) - if opts.audiounits: - conf.define('AUDIOUNITS',1) autowaf.display_msg(conf, 'Phone Home', opts.phone_home) if opts.phone_home: conf.env['PHONE_HOME'] = opts.phone_home @@ -543,9 +511,6 @@ def configure(conf): autowaf.display_msg(conf, 'Freesound', opts.freesound) if opts.freesound: conf.define('FREESOUND',1) - autowaf.display_msg(conf, 'GtkOSX', opts.gtkosx) - if opts.gtkosx: - conf.define ('GTKOSX', 1) autowaf.display_msg(conf, 'LV2 Support', bool(conf.env['HAVE_SLV2'])) autowaf.display_msg(conf, 'OGG', bool(conf.env['HAVE_OGG'])) autowaf.display_msg(conf, 'Rubberband', bool(conf.env['HAVE_RUBBERBAND'])) @@ -564,6 +529,8 @@ def configure(conf): autowaf.display_msg(conf, 'VST Support', opts.vst) if opts.vst: conf.define('VST_SUPPORT', 1) + conf.env.append_value('CPPPATH', Options.options.wine_include) + autowaf.check_header(conf, 'windows.h', mandatory = True) if bool(conf.env['JACK_SESSION']): conf.define ('HAVE_JACK_SESSION', 1) autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote) @@ -591,12 +558,9 @@ def configure(conf): config_text.write ('Build target: '); config_text.write (str (conf.env['build_target'])); config_text.write ("\\n\\\n") config_text.write ('Architecture flags: '); config_text.write (str (opts.arch)); config_text.write ("\\n\\\n") config_text.write ('Aubio: '); config_text.write (str (bool(conf.env['HAVE_AUBIO']))); config_text.write ("\\n\\\n") - config_text.write ('AudioUnits: '); config_text.write (str (opts.audiounits)); config_text.write ("\\n\\\n") - config_text.write ('CoreAudio: '); config_text.write (str (bool(conf.env['HAVE_COREAUDIO']))); config_text.write ("\\n\\\n") config_text.write ('FPU optimization: '); config_text.write (str (opts.fpu_optimization)); config_text.write ("\\n\\\n") config_text.write ('Freedesktop files: '); config_text.write (str (opts.freedesktop)); config_text.write ("\\n\\\n") config_text.write ('Freesound: '); config_text.write (str (opts.freesound)); config_text.write ("\\n\\\n") - config_text.write ('GtkOSX: '); config_text.write (str (opts.gtkosx)); config_text.write ("\\n\\\n") config_text.write ('LV2 support: '); config_text.write (str (bool(conf.env['HAVE_SLV2']))); config_text.write ("\\n\\\n") config_text.write ('Rubberband: '); config_text.write (str (bool(conf.env['HAVE_RUBBERBAND']))); config_text.write ("\\n\\\n") config_text.write ('Samplerate: '); config_text.write (str (bool(conf.env['HAVE_SAMPLERATE']))); config_text.write ("\\n\\\n") @@ -615,6 +579,18 @@ def configure(conf): config_text.close () def build(bld): + # 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/rubberband/rubberband') + bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext') + bld.path.find_dir ('libs/ardour/ardour') + bld.path.find_dir ('libs/taglib/taglib') + bld.path.find_dir ('libs/pbd/pbd') + autowaf.set_recursive() if sys.platform == 'darwin': bld.add_subdirs('libs/appleutility')