X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=de5bec5587b639145a5ae22375f99bda3063c694;hb=d46724515238fdb57f5d21c450883f7cc8897a56;hp=2944040f50a6ed7af770d3a709092f6143cebc2a;hpb=8c2715ce2c82873ce77319e918b01dbb9e8685b8;p=ardour.git diff --git a/SConstruct b/SConstruct index 2944040f50..de5bec5587 100644 --- a/SConstruct +++ b/SConstruct @@ -1,5 +1,9 @@ # -*- python -*- +# +# and there we have it, or do we? +# + import os import sys import re @@ -27,27 +31,33 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), + ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'), BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), - BoolOption('CMT', 'Compile with support for CMT Additions', 1), BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0), - BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 1), + BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0), + BoolOption('OLDFONTS', 'Old school font sizes', 0), + BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), + BoolOption('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 0), PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), - EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), + EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2), BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), - BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), + BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 1), + BoolOption('FREESOUND', 'Include Freesound database lookup', 0), BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), - BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), BoolOption('LIBLO', 'Compile with support for liblo library', 1), BoolOption('NLS', 'Set to turn on i18n support', 1), PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), BoolOption('SURFACES', 'Build support for control surfaces', 1), BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), - BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1), BoolOption('UNIVERSAL', 'Compile as universal binary. Requires that external libraries are already universal.', 0), BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), BoolOption('VST', 'Compile with support for VST', 0), + BoolOption('LV2', 'Compile with support for LV2 (if slv2 is available)', 0), + BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), + BoolOption('FREEDESKTOP', 'Install MIME type, icons and .desktop file as per the freedesktop.org spec (requires xdg-utils and shared-mime-info). "scons uninstall" removes associations in desktop database', 0), + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) ) #---------------------------------------------------------------------- @@ -65,6 +75,7 @@ class LibraryInfo(Environment): self.Append (LIBPATH = other.get ('LIBPATH', [])) self.Append (CPPPATH = other.get('CPPPATH', [])) self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) + self.Append (CCFLAGS = other.get('CCFLAGS', [])) self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) #doing LINKFLAGS breaks -framework @@ -230,6 +241,7 @@ def i18n (buildenv, sources, installenv): buildenv.PoBuild(po_file, ['po/'+po_file, potfile]) mo_file = po_file.replace (".po", ".mo") installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file)) + installenv.Alias ('msgupdate', buildenv.MoBuild (mo_file, po_file)) for lang in languages: modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/')) @@ -362,7 +374,7 @@ def distcopy (target, source, env): return p.close () def tarballer (target, source, env): - cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" + cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" + " --exclude .svn --exclude '.svn/*'" print 'running ', cmd, ' ... ' p = os.popen (cmd) return p.close () @@ -401,6 +413,28 @@ else: if os.path.isfile('.personal_use_only'): os.remove('.personal_use_only') +#################### +# push environment +#################### + +def pushEnvironment(context): + if os.environ.has_key('PATH'): + context.Append(PATH = os.environ['PATH']) + + if os.environ.has_key('PKG_CONFIG_PATH'): + context.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH']) + + if os.environ.has_key('CC'): + context['CC'] = os.environ['CC'] + + if os.environ.has_key('CXX'): + context['CXX'] = os.environ['CXX'] + + if os.environ.has_key('DISTCC_HOSTS'): + context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] + context['ENV']['HOME'] = os.environ['HOME'] + +pushEnvironment (env) ####################### # Dependency Checking # @@ -415,7 +449,7 @@ deps = \ 'samplerate' : '0.1.0', 'raptor' : '1.4.2', 'lrdf' : '0.4.0', - 'jack' : '0.105.0', + 'jack' : '0.109.0', 'libgnomecanvas-2.0' : '2.0' } @@ -424,16 +458,22 @@ def DependenciesRequiredMessage(): print 'Please consult http://ardour.org/building for more information' def CheckPKGConfig(context, version): - context.Message( 'Checking for pkg-config version >= %s... ' %version ) - ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0] - context.Result( ret ) - return ret + context.Message( 'Checking for pkg-config version >= %s... ' %version ) + ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0] + context.Result( ret ) + return ret def CheckPKGVersion(context, name, version): - context.Message( 'Checking for %s... ' % name ) - ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0] - context.Result( ret ) - return ret + context.Message( 'Checking for %s... ' % name ) + ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0] + context.Result( ret ) + return ret + +def CheckPKGExists(context, name): + context.Message ('Checking for %s...' % name) + ret = context.TryAction('pkg-config --exists %s' % name)[0] + context.Result (ret) + return ret conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, 'CheckPKGVersion' : CheckPKGVersion }) @@ -473,26 +513,64 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') libraries['samplerate'] = LibraryInfo() libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') -libraries['rubberband'] = LibraryInfo() -# -# chris cannam's rubberband has not yet been released -# -if os.path.exists ('libs/rubberband'): - libraries['rubberband'] = LibraryInfo (LIBS='rubberband', - LIBPATH='#libs/rubberband/lib', - CPPPATH='#libs/rubberband/src', - CXXFLAGS='-DUSE_RUBBERBAND') +conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) + +if conf.CheckPKGExists ('fftw3f'): + libraries['fftw3f'] = LibraryInfo() + libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') + +if conf.CheckPKGExists ('fftw3'): + libraries['fftw3'] = LibraryInfo() + libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3') + +env = conf.Finish () if env['FFT_ANALYSIS']: - libraries['fftw3f'] = LibraryInfo() - libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') # # Check for fftw3 header as well as the library - conf = Configure (libraries['fftw3f']) + # + + conf = Configure(libraries['fftw3']) + if conf.CheckHeader ('fftw3.h') == False: - print "FFT Analysis cannot be compiled without the FFTW3 headers, which don't seem to be installed" - sys.exit (1) - libraries['fftw3f'] = conf.Finish(); + print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed') + sys.exit (1) + conf.Finish() + +if env['FREESOUND']: + # + # Check for curl header as well as the library + # + + libraries['curl'] = LibraryInfo() + + conf = Configure(libraries['curl']) + + if conf.CheckHeader ('curl/curl.h') == False: + print ('Ardour cannot be compiled without the curl headers, which do not seem to be installed') + sys.exit (1) + else: + libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl') + conf.Finish() +else: + print 'FREESOUND support is not enabled. Build with \'scons FREESOUND=1\' to enable.' + +if env['LV2']: + conf = env.Configure(custom_tests = { 'CheckPKGExists' : CheckPKGExists }) + + if conf.CheckPKGExists ('slv2'): + libraries['slv2'] = LibraryInfo() + libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2') + env.Append (CCFLAGS="-DHAVE_LV2") + else: + print 'Building Ardour with LV2 support requires SLV2 >= 0.6.0' + print 'WARNING: SLV2 not found, or too old. Ardour will be built without LV2 support.' + print 'Until the 2.4 release, Ardour requires SLV2 out of SVN.' + print 'Testing would be very much appreciated! svn co http://svn.drobilla.net/lad/slv2' + env['LV2'] = 0 + conf.Finish() +else: + print 'LV2 support is not enabled. Build with \'scons LV2=1\' to enable.' libraries['jack'] = LibraryInfo() libraries['jack'].ParseConfig('pkg-config --cflags --libs jack') @@ -509,18 +587,15 @@ libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0') +libraries['freetype2'] = LibraryInfo() +libraries['freetype2'].ParseConfig ('pkg-config --cflags --libs freetype2') + libraries['gtk2'] = LibraryInfo() libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0') libraries['pango'] = LibraryInfo() libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango') -libraries['cairo'] = LibraryInfo() -libraries['cairo'].ParseConfig ('pkg-config --cflags --libs cairo') - -libraries['gtk2-unix-print'] = LibraryInfo() -libraries['gtk2-unix-print'].ParseConfig ('pkg-config --cflags --libs gtk+-unix-print-2.0') - libraries['libgnomecanvas2'] = LibraryInfo() libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0') @@ -541,7 +616,7 @@ libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext # SCons should really do this for us -conf = Configure (env) +conf = env.Configure () have_cxx = conf.TryAction (Action (str(env['CXX']) + ' --version')) if have_cxx[0] != 1: @@ -559,9 +634,9 @@ env = conf.Finish() opt_flags = [] if env['GPROFILE'] == 1: - debug_flags = [ '-O0', '-g', '-pg' ] + debug_flags = [ '-g', '-pg' ] else: - debug_flags = [ '-O0', '-g' ] + debug_flags = [ '-g' ] # guess at the platform, used to define compiler flags @@ -581,8 +656,10 @@ if env['DIST_TARGET'] == 'auto': # The [.] matches to the dot after the major version, "." would match any character if re.search ("darwin[0-7][.]", config[config_kernel]) != None: env['DIST_TARGET'] = 'panther' - else: + if re.search ("darwin8[.]", config[config_kernel]) != None: env['DIST_TARGET'] = 'tiger' + else: + env['DIST_TARGET'] = 'leopard' else: if re.search ("x86_64", config[config_cpu]) != None: env['DIST_TARGET'] = 'x86_64' @@ -648,9 +725,9 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6 # optimization section if env['FPU_OPTIMIZATION']: - if env['DIST_TARGET'] == 'tiger': - opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS") - debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS") + if env['DIST_TARGET'] == 'tiger' or env['DIST_TARGET'] == 'leopard': + opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); + debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); libraries['core'].Append(LINKFLAGS= '-framework Accelerate') elif env['DIST_TARGET'] == 'i686' or env['DIST_TARGET'] == 'x86_64': opt_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") @@ -669,6 +746,18 @@ if env['DIST_TARGET'] == 'x86_64': else: env['LIBDIR']='lib' +# +# a single way to test if we're on OS X +# + +if env['DIST_TARGET'] in ['panther', 'tiger', 'leopard' ]: + env['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. + env.Append (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") +else: + env['IS_OSX'] = 0 + # # save off guessed arch element in an env # @@ -701,10 +790,14 @@ else: env.Append(CCFLAGS=" ".join (opt_flags)) env.Append(LINKFLAGS=" ".join (opt_flags)) +if env['STL_DEBUG'] == 1: + env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG") + if env['UNIVERSAL'] == 1: env.Append(CCFLAGS="-arch i386 -arch ppc") env.Append(LINKFLAGS="-arch i386 -arch ppc") + # # warnings flags # @@ -727,24 +820,51 @@ if env['LIBLO']: def prep_libcheck(topenv, libinfo): - if topenv['DIST_TARGET'] == 'panther' or topenv['DIST_TARGET'] == 'tiger': - # - # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default. - # All libraries needed should be built against this location - if topenv['GTKOSX']: - libinfo.Append(CCFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib") - libinfo.Append(CCFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") - + if topenv['IS_OSX']: + # + # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default. + # All libraries needed should be built against this location + if topenv['GTKOSX']: + libinfo.Append(CPPPATH="/opt/gtk/include", LIBPATH="/opt/gtk/lib") + libinfo.Append(CXXFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib") + libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib") + libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") + prep_libcheck(env, env) + # -# glibc backtrace API, needed everywhere if we want to do shared_ptr debugging -# +# these are part of the Ardour source tree because they are C++ +# -conf = Configure (env) -if conf.CheckCHeader('execinfo.h'): - conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO") -env = conf.Finish () +libraries['vamp'] = LibraryInfo (LIBS='vampsdk', + LIBPATH='#libs/vamp-sdk', + CPPPATH='#libs/vamp-sdk') +libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk', + LIBPATH='#libs/vamp-sdk', + CPPPATH='#libs/vamp-sdk') + +env['RUBBERBAND'] = False + +#conf = Configure (env) +# +#if conf.CheckHeader ('fftw3.h'): +# env['RUBBERBAND'] = True +# libraries['rubberband'] = LibraryInfo (LIBS='rubberband', +# LIBPATH='#libs/rubberband', +# CPPPATH='#libs/rubberband', +# CCFLAGS='-DUSE_RUBBERBAND') +#else: +# print "" +# print "-------------------------------------------------------------------------" +# print "You do not have the FFTW single-precision development package installed." +# print "This prevents Ardour from using the Rubberband library for timestretching" +# print "and pitchshifting. It will fall back on SoundTouch for timestretch, and " +# print "pitchshifting will not be available." +# print "-------------------------------------------------------------------------" +# print "" +# +#conf.Finish() # # Check for libusb @@ -771,7 +891,7 @@ libraries['usb'] = conf.Finish () libraries['flac'] = LibraryInfo () prep_libcheck(env, libraries['flac']) -libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") +libraries['flac'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") # # june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions @@ -780,12 +900,14 @@ libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local # conf = Configure (libraries['flac']) -if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_set_read_callback', language='CXX'): +if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_init', language='CXX'): conf.env.Append(CCFLAGS='-DHAVE_FLAC') use_flac = True else: use_flac = False + libraries['flac'] = conf.Finish () + # or if that fails... #libraries['flac'] = LibraryInfo (LIBS='FLAC') @@ -793,7 +915,7 @@ libraries['flac'] = conf.Finish () libraries['boost'] = LibraryInfo () prep_libcheck(env, libraries['boost']) -libraries['boost'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") +libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") conf = Configure (libraries['boost']) if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False: print "Boost header files do not appear to be installed." @@ -834,17 +956,36 @@ else: libraries['dmalloc'] = conf.Finish () # -# Audio/MIDI library (needed for MIDI, since audio is all handled via JACK. Note, however, that -# we still need ALSA & CoreAudio to discover audio devices for the engine -# dialog, regardless of what MIDI subsystem is being used) +# ensure FREEDESKTOP target is doable.. +# + +conf = env.Configure () +if env['FREEDESKTOP']: + have_update_mime_database = conf.TryAction (Action ('update-mime-database -v')) + if have_update_mime_database[0] != 1: + print "Warning. You have no update-mime-database command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 + have_gtk_update_icon_cache = conf.TryAction (Action ('gtk-update-icon-cache -?')) + if have_gtk_update_icon_cache[0] != 1: + print "Warning. You have no gtk-update-icon-cache command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 + have_update_desktop_database = conf.TryAction (Action ('update-desktop-database -?')) + if have_update_desktop_database[0] != 1: + print "Warning. You have no update-desktop-database command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 +env = conf.Finish() + +# +# Audio/MIDI library (needed for MIDI, since audio is all handled via JACK) # conf = Configure(env) + +# ALSA, for engine dialog +libraries['asound'] = LibraryInfo () if conf.CheckCHeader('alsa/asoundlib.h'): - libraries['sysaudio'] = LibraryInfo (LIBS='asound') -elif conf.CheckCHeader('/System/Library/Frameworks/CoreAudio.framework/Versions/A/Headers/CoreAudio.h'): - libraries['sysaudio'] = LibraryInfo (LINKFLAGS= '-framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load') + libraries['asound'] = LibraryInfo (LIBS='asound') if conf.CheckCHeader('jack/midiport.h'): libraries['sysmidi'] = LibraryInfo (LIBS='jack') @@ -863,14 +1004,13 @@ elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Co if env['GTKOSX']: # We need Carbon as well as the rest libraries['sysmidi'] = LibraryInfo ( - LINKFLAGS = ' -framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -framework Carbon -bind_at_load' ) + LINKFLAGS = ' -framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -framework Carbon -bind_at_load' ) else: libraries['sysmidi'] = LibraryInfo ( LINKFLAGS = ' -framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load' ) env['SYSMIDI'] = 'CoreMIDI' subst_dict['%MIDITAG%'] = "ardour" subst_dict['%MIDITYPE%'] = "coremidi" - print "Using CoreMIDI" else: print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries." sys.exit (1) @@ -883,8 +1023,7 @@ if env['SYSLIBS']: { 'sigc++-2.0' : '2.0', 'gtkmm-2.4' : '2.8', - 'libgnomecanvasmm-2.6' : '2.12.0', - 'libSoundTouch' : '1.2.1' + 'libgnomecanvasmm-2.6' : '2.12.0' } conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, @@ -895,13 +1034,15 @@ if env['SYSLIBS']: print '%s >= %s not found.' %(pkg, version) DependenciesRequiredMessage() Exit(1) - + env = conf.Finish() libraries['sigc2'] = LibraryInfo() libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0') libraries['glibmm2'] = LibraryInfo() libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4') + libraries['cairo'] = LibraryInfo() + libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo') libraries['cairomm'] = LibraryInfo() libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0') libraries['gdkmm2'] = LibraryInfo() @@ -912,8 +1053,6 @@ if env['SYSLIBS']: libraries['atkmm'].ParseConfig ('pkg-config --cflags --libs atkmm-1.6') libraries['pangomm'] = LibraryInfo() libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4') - libraries['cairomm'] = LibraryInfo() - libraries['cairomm'].ParseConfig ('pkg-config --cflags --libs cairomm-1.0') libraries['libgnomecanvasmm'] = LibraryInfo() libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6') @@ -930,17 +1069,16 @@ if env['SYSLIBS']: # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() - libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') # Comment the previous line and uncomment this for Debian: - #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') coredirs = [ - 'templates', - 'manual' + 'templates' ] subdirs = [ @@ -948,6 +1086,8 @@ if env['SYSLIBS']: 'libs/pbd', 'libs/midi++2', 'libs/ardour', + 'libs/vamp-sdk', + 'libs/vamp-plugins/', # these are unconditionally included but have # tests internally to avoid compilation etc # if VST is not set @@ -967,21 +1107,27 @@ if env['SYSLIBS']: ] else: + libraries['cairo'] = LibraryInfo() + libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo') + + libraries['gtk2-unix-print'] = LibraryInfo() + libraries['gtk2-unix-print'].ParseConfig('pkg-config --cflags --libs gtk+-unix-print-2.0') + libraries['sigc2'] = LibraryInfo(LIBS='sigc++2', LIBPATH='#libs/sigc++2', CPPPATH='#libs/sigc++2') libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2', LIBPATH='#libs/glibmm2', - CPPPATH=['#libs/glibmm2/glib', '#libs/glibmm2']) - libraries['cairomm'] = LibraryInfo(LIBS='cairomm', - LIBPATH="#libs/cairomm", - CPPPATH='#libs/cairomm') + CPPPATH='#libs/glibmm2/glib') libraries['pangomm'] = LibraryInfo(LIBS='pangomm', LIBPATH='#libs/gtkmm2/pango', CPPPATH='#libs/gtkmm2/pango') libraries['atkmm'] = LibraryInfo(LIBS='atkmm', LIBPATH='#libs/gtkmm2/atk', CPPPATH='#libs/gtkmm2/atk') + libraries['cairomm'] = LibraryInfo(LIBS='cairomm', + LIBPATH='#libs/cairomm', + CPPPATH='#libs/cairomm') libraries['gdkmm2'] = LibraryInfo(LIBS='gdkmm2', LIBPATH='#libs/gtkmm2/gdk', CPPPATH='#libs/gtkmm2/gdk') @@ -1006,9 +1152,7 @@ else: CPPPATH='#libs/appleutility') coredirs = [ - 'libs/soundtouch', - 'templates', - 'manual' + 'templates' ] subdirs = [ @@ -1017,6 +1161,8 @@ else: 'libs/pbd', 'libs/midi++2', 'libs/ardour', + 'libs/vamp-sdk', + 'libs/vamp-plugins/', # these are unconditionally included but have # tests internally to avoid compilation etc # if VST is not set @@ -1029,17 +1175,16 @@ else: ] gtk_subdirs = [ - 'libs/glibmm2', - 'libs/gtkmm2/pango', - 'libs/gtkmm2/atk', - 'libs/gtkmm2/gdk', - 'libs/gtkmm2/gtk', - 'libs/cairomm', - 'libs/libgnomecanvasmm', -# 'libs/flowcanvas', + 'libs/glibmm2', + 'libs/gtkmm2/pango', + 'libs/gtkmm2/atk', + 'libs/gtkmm2/gdk', + 'libs/gtkmm2/gtk', + 'libs/libgnomecanvasmm', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + 'libs/clearlooks', + 'libs/cairomm' ] # @@ -1075,24 +1220,16 @@ else: env['POWERMATE'] = 0 env['TRANZPORT'] = 0 -opts.Save('scache.conf', env) -Help(opts.GenerateHelpText(env)) - -if os.environ.has_key('PATH'): - env.Append(PATH = os.environ['PATH']) - -if os.environ.has_key('PKG_CONFIG_PATH'): - env.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH']) - -if os.environ.has_key('CC'): - env['CC'] = os.environ['CC'] +# +# timestretch libraries +# -if os.environ.has_key('CXX'): - env['CXX'] = os.environ['CXX'] +timefx_subdirs = ['libs/soundtouch'] +#if env['RUBBERBAND']: +# timefx_subdirs += ['libs/rubberband'] -if os.environ.has_key('DISTCC_HOSTS'): - env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] - env['ENV']['HOME'] = os.environ['HOME'] +opts.Save('scache.conf', env) +Help(opts.GenerateHelpText(env)) final_prefix = '$PREFIX' @@ -1112,14 +1249,6 @@ else: config_prefix = '$DESTDIR' + final_config_prefix -# For colorgcc -if os.environ.has_key('PATH'): - env['PATH'] = os.environ['PATH'] -if os.environ.has_key('TERM'): - env['TERM'] = os.environ['TERM'] -if os.environ.has_key('HOME'): - env['HOME'] = os.environ['HOME'] - # # everybody needs this # @@ -1174,8 +1303,8 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreAudio.framework/Versions/A/ subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in" subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out" else: - subst_dict['%JACK_INPUT%'] = "system:playback_" - subst_dict['%JACK_OUTPUT%'] = "system:capture_" + subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_" + subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_" # posix_memalign available if not conf.CheckFunc('posix_memalign'): @@ -1201,12 +1330,13 @@ if os.path.exists('.svn'): the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision) remove_ardour = env.Command ('frobnicatory_decoy2', [], - [ Delete ('$PREFIX/etc/ardour2'), - Delete ('$PREFIX/lib/ardour2'), - Delete ('$PREFIX/bin/ardour2')]) + [ Delete ('$PREFIX/etc/ardour3'), + Delete ('$PREFIX/lib/ardour3'), + Delete ('$PREFIX/bin/ardour3'), + Delete ('$PREFIX/share/ardour3')]) env.Alias('revision', the_revision) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour_system.rc')) env.Alias('uninstall', remove_ardour) Default (sysrcbuild) @@ -1256,7 +1386,7 @@ env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE'])))) for subdir in coredirs: SConscript (subdir + '/SConscript') -for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: +for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]: for subdir in sublistdir: SConscript (subdir + '/SConscript')