X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=5e37b5bfb4526ede6cc3dea5778952473e246b93;hb=800178bb666a9c31d4c12e50d653f12f42df6bed;hp=8b3f16a04ad0deb098998c0c26a54eb6515a3279;hpb=666e0870554705f4fb466fc6b188fe9b4000ca49;p=ardour.git diff --git a/SConstruct b/SConstruct index 8b3f16a04a..5e37b5bfb4 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.0rc2' +ardour_version = '2.1pre' subst_dict = { } @@ -29,7 +29,7 @@ opts.AddOptions( ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), - BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), + BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 1), 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), BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), @@ -45,7 +45,8 @@ opts.AddOptions( BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), BoolOption('VST', 'Compile with support for VST', 0), BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), - BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1), + BoolOption('CMT', 'Compile with support for CMT Additions', 1) ) #---------------------------------------------------------------------- @@ -408,14 +409,13 @@ deps = \ { 'glib-2.0' : '2.10.1', 'gthread-2.0' : '2.10.1', - 'gtk+-2.0' : '2.10.0', + 'gtk+-2.0' : '2.8.1', 'libxml-2.0' : '2.6.0', 'samplerate' : '0.1.0', 'raptor' : '1.4.2', 'lrdf' : '0.4.0', - 'jack' : '0.101.1', - 'libgnomecanvas-2.0' : '2.0', - 'cairo' : '1.2.4' + 'jack' : '0.105.0', + 'libgnomecanvas-2.0' : '2.0' } def DependenciesRequiredMessage(): @@ -492,12 +492,6 @@ libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0') libraries['xslt'] = LibraryInfo() libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt') -libraries['cairo'] = LibraryInfo() -libraries['cairo'].ParseConfig ('pkg-config --cflags --libs cairo') - -libraries['pangocairo'] = LibraryInfo() -libraries['pangocairo'].ParseConfig ('pkg-config --cflags --libs pangocairo') - libraries['glib2'] = LibraryInfo() libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') @@ -507,9 +501,6 @@ libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0') libraries['gtk2'] = LibraryInfo() libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0') -libraries['gtk2-unix-print'] = LibraryInfo() -libraries['gtk2-unix-print'].ParseConfig ('pkg-config --cflags --libs gtk+-unix-print-2.0') - libraries['pango'] = LibraryInfo() libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango') @@ -802,18 +793,25 @@ libraries['dmalloc'] = conf.Finish () # conf = Configure(env) - -if conf.CheckCHeader('alsa/asoundlib.h'): +if conf.CheckCHeader('jack/midiport.h'): + libraries['sysmidi'] = LibraryInfo (LIBS='jack') + env['SYSMIDI'] = 'JACK MIDI' + subst_dict['%MIDITAG%'] = "control" + subst_dict['%MIDITYPE%'] = "jack" + print "Using JACK MIDI" +elif conf.CheckCHeader('alsa/asoundlib.h'): libraries['sysmidi'] = LibraryInfo (LIBS='asound') env['SYSMIDI'] = 'ALSA Sequencer' subst_dict['%MIDITAG%'] = "seq" subst_dict['%MIDITYPE%'] = "alsa/sequencer" + print "Using ALSA MIDI" elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'): # this line is needed because scons can't handle -framework in ParseConfig() yet. 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) @@ -844,6 +842,8 @@ if env['SYSLIBS']: libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0') libraries['glibmm2'] = LibraryInfo() libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4') + libraries['cairomm'] = LibraryInfo() + libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0') libraries['gdkmm2'] = LibraryInfo() libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4') libraries['gtkmm2'] = LibraryInfo() @@ -863,11 +863,14 @@ if env['SYSLIBS']: LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile/src']) +# libraries['libglademm'] = LibraryInfo() +# libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') + # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() - libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') + libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') # 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', @@ -907,9 +910,6 @@ else: libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2', LIBPATH='#libs/glibmm2', CPPPATH='#libs/glibmm2') - libraries['cairomm'] = LibraryInfo(LIBS='cairomm', - LIBPATH='#libs/cairomm', - CPPPATH='#libs/cairomm') libraries['pangomm'] = LibraryInfo(LIBS='pangomm', LIBPATH='#libs/gtkmm2/pango', CPPPATH='#libs/gtkmm2/pango') @@ -932,6 +932,9 @@ else: libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) +# libraries['libglademm'] = LibraryInfo(LIBS='libglademm', +# LIBPATH='#libs/libglademm', +# CPPPATH='#libs/libglademm') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') @@ -960,7 +963,6 @@ else: gtk_subdirs = [ 'libs/glibmm2', - 'libs/cairomm', 'libs/gtkmm2/pango', 'libs/gtkmm2/atk', 'libs/gtkmm2/gdk', @@ -1027,6 +1029,14 @@ 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 # @@ -1081,8 +1091,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%'] = "alsa_pcm:playback_" - subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_" + subst_dict['%JACK_INPUT%'] = "system:playback_" + subst_dict['%JACK_OUTPUT%'] = "system:capture_" # posix_memalign available if not conf.CheckFunc('posix_memalign'):