smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

build tweaks to include tranzport code in tarball

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1174 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-11-30 17:52:26 +00:00
parent 9f2164b4f3
commit ba32e48dd1
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SConstruct
View file

@ -16,7 +16,7 @@ import SCons.Node.FS
SConsignFile() SConsignFile()
EnsureSConsVersion(0, 96) EnsureSConsVersion(0, 96)
version = '2.0beta8' version = '2.0beta9'
subst_dict = { } subst_dict = { }
@ -42,7 +42,8 @@ opts.AddOptions(
BoolOption('SURFACES', 'Build support for control surfaces', 0), 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('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('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 # * always build the LGPL control protocol lib, since we link against it from libardour
# ditto for generic MIDI # * 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 env['SURFACES']:
if have_libusb: if have_libusb:
surface_subdirs += [ 'libs/surfaces/tranzport' ] env['TRANZPORT'] = 'yes'
if os.access ('libs/surfaces/sony9pin', os.F_OK): if os.access ('libs/surfaces/sony9pin', os.F_OK):
surface_subdirs += [ 'libs/surfaces/sony9pin' ] surface_subdirs += [ 'libs/surfaces/sony9pin' ]

3
libs/surfaces/tranzport/SConscript
View file

@ -44,11 +44,10 @@ tranzport.Merge ([
libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files) libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
if tranzport['TRANZPORT']:
Default(libardour_tranzport) Default(libardour_tranzport)
if env['NLS']: if env['NLS']:
i18n (tranzport, tranzport_files, env) i18n (tranzport, tranzport_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport)) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport))
env.Alias('tarball', env.Distribute (env['DISTTREE'], env.Alias('tarball', env.Distribute (env['DISTTREE'],

2
svn_revision.h
View file

@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__ #ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__ #define __ardour_svn_revision_h__
static const char* ardour_svn_revision = "1137"; static const char* ardour_svn_revision = "1173";
#endif #endif