projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the session resampler which now should work for 2.0 sessions and
[ardour.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index 95fa911a8df9b9880eede3596d14220daedda7c0..9f7e915b3dc35c20a0d2fc8de1ef144964861da3 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-16,7
+16,7
@@
import SCons.Node.FS
SConsignFile()
EnsureSConsVersion(0, 96)
SConsignFile()
EnsureSConsVersion(0, 96)
-ardour_version = '2.0
beta11.
1'
+ardour_version = '2.0
rc
1'
subst_dict = { }
subst_dict = { }
@@
-601,7
+601,7
@@
elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6
if env['DIST_TARGET'] != 'i386':
flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
if env['DIST_TARGET'] != 'i386':
flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
- x86_flags = flag_line.split (": ")[1:][0].split (
' '
)
+ x86_flags = flag_line.split (": ")[1:][0].split ()
if "mmx" in x86_flags:
opt_flags.append ("-mmmx")
if "mmx" in x86_flags:
opt_flags.append ("-mmmx")
@@
-728,7
+728,8
@@
prep_libcheck(env, libraries['flac'])
libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
conf = Configure (libraries['flac'])
libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
conf = Configure (libraries['flac'])
-conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX')
+if conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX'):
+ conf.env.Append(CCFLAGS='-DHAVE_FLAC')
libraries['flac'] = conf.Finish ()
# or if that fails...
libraries['flac'] = conf.Finish ()
# or if that fails...
@@
-1082,7
+1083,7
@@
subst_dict['%REVISION_STRING%'] = ''
if os.path.exists('.svn'):
subst_dict['%REVISION_STRING%'] = '.' + fetch_svn_revision ('.') + 'svn'
if os.path.exists('.svn'):
subst_dict['%REVISION_STRING%'] = '.' + fetch_svn_revision ('.') + 'svn'
-specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict)
+
#
specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict)
the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
@@
-1100,7
+1101,6
@@
env.Distribute (env['DISTTREE'],
[ 'SConstruct', 'svn_revision.h',
'COPYING', 'PACKAGER_README', 'README',
'ardour.rc.in',
[ 'SConstruct', 'svn_revision.h',
'COPYING', 'PACKAGER_README', 'README',
'ardour.rc.in',
- 'ardour.spec',
'ardour_system.rc',
'tools/config.guess',
'icons/icon/ardour_icon_mac_mask.png',
'ardour_system.rc',
'tools/config.guess',
'icons/icon/ardour_icon_mac_mask.png',