diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-06-01 22:26:12 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-06-01 22:26:12 +0000 |
| commit | 7777d54887d95a38cd0222233ca06d8a146e5a76 (patch) | |
| tree | 4b2cf6be0c108ca86d8bb0d88eef0529b998555f /SConstruct | |
| parent | 2291d59bc813597c95f2f00b2e8ae697f1f284f9 (diff) | |
2nd stage of denormal handling (from trunk); fix to avoid FLAC support when using a too-new FLAC library
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@1940 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 15e4f1e9ca..4d0b6ef677 100644 --- a/SConstruct +++ b/SConstruct @@ -36,7 +36,6 @@ opts.AddOptions( BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), - BoolOption('USE_XMMINTRIN', 'Use gcc XMM intrinsics where possible', 1), BoolOption('LIBLO', 'Compile with support for liblo library', 1), BoolOption('NLS', 'Set to turn on i18n support', 1), PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), @@ -736,8 +735,14 @@ libraries['flac'] = LibraryInfo () prep_libcheck(env, libraries['flac']) libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") +# +# june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions +# since the version of libsndfile we have internally does not support +# the new API that libFLAC has adopted +# + conf = Configure (libraries['flac']) -if conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX'): +if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_set_read_callback', language='CXX'): conf.env.Append(CCFLAGS='-DHAVE_FLAC') libraries['flac'] = conf.Finish () |