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

maybe fix flac stuff

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1944 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-06-02 00:35:09 +00:00
parent b32765571b
commit 7bfe236ba7
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -745,6 +745,9 @@ 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 = False
else:
use_flac = True
libraries['flac'] = conf.Finish () libraries['flac'] = conf.Finish ()
# or if that fails... # or if that fails...
@ -1085,7 +1088,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,9 +6,10 @@ 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'] ]) if use_flac:
sndfile.Merge([libraries['flac'] ])
domain = 'libsndfile' domain = 'libsndfile'