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

flac-handling fix, from trunk

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2084 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-06-29 14:45:49 +00:00
parent 1cf9ed976a
commit 2b2f34669e
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -744,6 +744,10 @@ libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local
conf = Configure (libraries['flac']) conf = Configure (libraries['flac'])
if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_set_read_callback', language='CXX'): if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_set_read_callback', language='CXX'):
conf.env.Append(CCFLAGS='-DHAVE_FLAC') conf.env.Append(CCFLAGS='-DHAVE_FLAC')
use_flac = True
else:
use_flac = False
libraries['flac'] = conf.Finish () libraries['flac'] = conf.Finish ()
# or if that fails... # or if that fails...
@ -1074,7 +1078,7 @@ env = conf.Finish()
if env['NLS'] == 1: if env['NLS'] == 1:
env.Append(CCFLAGS="-DENABLE_NLS") env.Append(CCFLAGS="-DENABLE_NLS")
Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict') Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict use_flac')
# #
# the configuration file may be system dependent # the configuration file may be system dependent

5
libs/libsndfile/SConscript
View file

@ -6,7 +6,7 @@ import glob
sndfile_files = glob.glob('src/*.c') + glob.glob('src/GSM610/*.c') + glob.glob('src/G72x/*.c') sndfile_files = glob.glob('src/*.c') + glob.glob('src/GSM610/*.c') + glob.glob('src/G72x/*.c')
Import('env install_prefix libraries') Import('env install_prefix libraries use_flac')
sndfile = env.Copy() sndfile = env.Copy()
sndfile.Merge([libraries['flac'] ]) sndfile.Merge([libraries['flac'] ])
@ -28,7 +28,10 @@ sndfile = conf.Finish()
libsndfile = sndfile.SharedLibrary('sndfile-ardour', sndfile_files) libsndfile = sndfile.SharedLibrary('sndfile-ardour', sndfile_files)
if use_flac:
sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ) sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ)
else:
sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure --disable-flac && cd -', ENV=os.environ)
Default([sndfile_h,libsndfile]) Default([sndfile_h,libsndfile])