diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 01:44:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 01:45:37 +0100 |
| commit | 1311ae8eeeb90247221b5b1fa2690d5ec57daa03 (patch) | |
| tree | 67130e957594998af62f35ca45bbcee1f6fef94c /configure | |
| parent | 985c5f226af35fff00a86bc36cc8eaa8da3d23b0 (diff) | |
| parent | c869fcdeac3b7cd71a852b928902daadeca55685 (diff) | |
| download | ffmpeg-1311ae8eeeb90247221b5b1fa2690d5ec57daa03.tar.gz | |
Merge commit 'c869fcdeac3b7cd71a852b928902daadeca55685'
* commit 'c869fcdeac3b7cd71a852b928902daadeca55685':
configure: Move toolchain dependency declarations to a more appropriate place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1789,13 +1789,10 @@ fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" fast_clz_if_any="alpha avr32 mips ppc x86" fast_unaligned_if_any="ppc x86" -inline_asm_deps="!tms470" need_memalign="altivec neon sse" symver_if_any="symver_asm_label symver_gnu_asm" -log2_deps="!libc_msvcrt" - # subsystems dct_select="rdft" error_resilience_select="dsputil" @@ -3865,6 +3862,7 @@ case $libc_type in add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ _snprintf=avpriv_snprintf \ vsnprintf=avpriv_vsnprintf + disable log2 ;; esac @@ -4681,6 +4679,7 @@ elif enabled armcc; then add_cflags -W${armcc_opt},--diag_suppress=513 # pointer sign elif enabled tms470; then add_cflags -pds=824 -pds=837 + disable inline_asm elif enabled pathscale; then add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF elif enabled_any msvc icl; then |