diff options
| author | Peter Tissen <dravorek@gmail.com> | 2015-03-06 19:39:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 21:49:00 +0100 |
| commit | 42493843dc6f990ebab6b82df2e9cfab0e019b80 (patch) | |
| tree | 7ec1a11925a70c97b256c9ae05d4681a17a433e0 | |
| parent | 482c86f2319c73a0ea414a1845de58febf7b0e30 (diff) | |
| download | ffmpeg-42493843dc6f990ebab6b82df2e9cfab0e019b80.tar.gz | |
configure: Make compilable with VS2015
So Visual Studio 2015 has some breaking changes regarding the C
runtime. In short, they made C99 compatable runtime.
Refer to http://blogs.msdn.com/b/vcblog/archive/2014/06/18/crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1.aspx
Made-Seriously-Happy: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -3531,7 +3531,9 @@ probe_cc(){ _flags='-nologo' _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64' if [ $pfx = hostcc ]; then - append _cflags -Dsnprintf=_snprintf + if [ -z "$cl_major_ver" ] || [ $cl_major_ver -le 18 ]; then + append _cflags -Dsnprintf=_snprintf + fi fi disable stripping elif $_cc --version 2>/dev/null | grep -q ^cparser; then @@ -4318,10 +4320,12 @@ case $libc_type in add_compat strtod.o strtod=avpriv_strtod ;; msvcrt) - add_compat strtod.o strtod=avpriv_strtod - add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ - _snprintf=avpriv_snprintf \ - vsnprintf=avpriv_vsnprintf + if [ -z "$cl_major_ver" ] || [ $cl_major_ver -le 18 ]; then + add_compat strtod.o strtod=avpriv_strtod + add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ + _snprintf=avpriv_snprintf \ + vsnprintf=avpriv_vsnprintf + fi ;; esac |