diff options
| author | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
| commit | 959a7909c1adca430a63f783fd16687242a7be3d (patch) | |
| tree | b5048c3cc1bbb60bb680472b97ebba6ebb92d72f /SConstruct | |
| parent | 96ca08b9257e4048294cd1804a65d4ae6cd88814 (diff) | |
Merged with trunk R1705.
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).
git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 48dd189b93..57d5dc344c 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.0beta12' +ardour_version = '2.0rc1' subst_dict = { } @@ -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']) -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... |