diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-30 17:52:26 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-30 17:52:26 +0000 |
| commit | ba32e48dd18cfe48725ec27a740c7accadb8d489 (patch) | |
| tree | 62ea7204792d03099c9fee805ef453cf88ed5d07 | |
| parent | 9f2164b4f3b030177a229ddc3e87eb431af1bd54 (diff) | |
build tweaks to include tranzport code in tarball
git-svn-id: svn://localhost/ardour2/trunk@1174 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 15 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/SConscript | 11 | ||||
| -rw-r--r-- | svn_revision.h | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/SConstruct b/SConstruct index 1ed23dd3aa..776d2a6241 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -version = '2.0beta8' +version = '2.0beta9' subst_dict = { } @@ -42,7 +42,8 @@ opts.AddOptions( BoolOption('SURFACES', 'Build support for control surfaces', 0), 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('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), - BoolOption('VST', 'Compile with support for VST', 0) + BoolOption('VST', 'Compile with support for VST', 0), + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 0) ) #---------------------------------------------------------------------- @@ -673,15 +674,17 @@ else: ] # -# always build the LGPL control protocol lib, since we link against it ourselves -# ditto for generic MIDI +# * always build the LGPL control protocol lib, since we link against it from libardour +# * ditto for generic MIDI +# * tranzport checks whether it should build internally, but we need here so that +# its included in the tarball # -surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi' ] +surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport' ] if env['SURFACES']: if have_libusb: - surface_subdirs += [ 'libs/surfaces/tranzport' ] + env['TRANZPORT'] = 'yes' if os.access ('libs/surfaces/sony9pin', os.F_OK): surface_subdirs += [ 'libs/surfaces/sony9pin' ] diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index 3f9cc5cc15..c79620fcb3 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -44,12 +44,11 @@ tranzport.Merge ([ libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files) -Default(libardour_tranzport) - -if env['NLS']: - i18n (tranzport, tranzport_files, env) - -env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport)) +if tranzport['TRANZPORT']: + Default(libardour_tranzport) + if env['NLS']: + i18n (tranzport, tranzport_files, env) + env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + diff --git a/svn_revision.h b/svn_revision.h index 77f72965cd..bed6e4fdd3 100644 --- a/svn_revision.h +++ b/svn_revision.h @@ -1,4 +1,4 @@ #ifndef __ardour_svn_revision_h__ #define __ardour_svn_revision_h__ -static const char* ardour_svn_revision = "1137"; +static const char* ardour_svn_revision = "1173"; #endif |