diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 10:45:27 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 10:46:21 +0200 |
commit | 2afcd16711e029185288375f0bf9946d406bb0db (patch) | |
tree | 12c69b892c825c7ea6aa9901a4bc10f8901dcff7 | |
parent | d0a34aeedff187873e1b42e0902d9dfbba08a1f4 (diff) | |
parent | 0b6899f154347cdd0aa66c5ec16ed9c65871766f (diff) | |
download | ffmpeg-2afcd16711e029185288375f0bf9946d406bb0db.tar.gz |
Merge commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f'
* commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f':
configure: msvc: Set the target windows version to XP if no target is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-x | configure | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -3556,6 +3556,13 @@ elif check_func_headers stdlib.h _get_doserrno; then add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ _snprintf=avpriv_snprintf \ vsnprintf=avpriv_vsnprintf + # The MSVC 2010 headers (Win 7.0 SDK) set _WIN32_WINNT to + # 0x601 by default unless something else is set by the user. + # This can easily lead to us detecting functions only present + # in such new versions and producing binaries requiring windows 7.0. + # Therefore explicitly set the default to XP unless the user has + # set something else on the command line. + check_cpp_condition stdlib.h "defined(_WIN32_WINNT)" || add_cppflags -D_WIN32_WINNT=0x0502 elif check_cpp_condition stddef.h "defined __KLIBC__"; then libc_type=klibc fi |