diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-06-02 00:35:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-06-02 00:35:09 +0000 |
| commit | 7bfe236ba7975d102f80cae6c997c56a321d50f9 (patch) | |
| tree | 616ffc7f16937a6d41a6d03dce5de6474819ff7f | |
| parent | b32765571bdb487f0e5ed3b840095e4f91b110f9 (diff) | |
maybe fix flac stuff
git-svn-id: svn://localhost/ardour2/trunk@1944 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | libs/libsndfile/SConscript | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index d0ba26b3be..0e7c571b79 100644 --- a/SConstruct +++ b/SConstruct @@ -745,6 +745,9 @@ libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local conf = Configure (libraries['flac']) if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_set_read_callback', language='CXX'): conf.env.Append(CCFLAGS='-DHAVE_FLAC') + use_flac = False +else: + use_flac = True libraries['flac'] = conf.Finish () # or if that fails... @@ -1085,7 +1088,7 @@ env = conf.Finish() if env['NLS'] == 1: 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 diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript index 9e8ccc93f7..3508a6994e 100644 --- a/libs/libsndfile/SConscript +++ b/libs/libsndfile/SConscript @@ -6,9 +6,10 @@ import glob 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.Merge([libraries['flac'] ]) +if use_flac: + sndfile.Merge([libraries['flac'] ]) domain = 'libsndfile' |