[FFmpeg-cvslog] configure: Make compilable with VS2015
Peter Tissen
git at videolan.org
Fri Mar 6 21:57:06 CET 2015
ffmpeg | branch: master | Peter Tissen <dravorek at gmail.com> | Fri Mar 6 19:39:27 2015 +0100| [42493843dc6f990ebab6b82df2e9cfab0e019b80] | committer: Michael Niedermayer
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 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42493843dc6f990ebab6b82df2e9cfab0e019b80
---
configure | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index ce745d2..1ea2032 100755
--- a/configure
+++ b/configure
@@ -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
More information about the ffmpeg-cvslog
mailing list