vlc | branch: master | Martin Storsjö <[email protected]> | Fri Apr 3 14:10:42 2020 +0300| [0d65fe038a76d3686d2e37c5b522fb24b92d8157] | committer: Martin Storsjö
configure: Check the toolchain default _WIN32_WINNT in addition to a command line override Since 255e2ce27, we try not to override _WIN32_WINNT in case it already is defined on the command line to a higher value. However, if it isn't specified on the command line, but the toolchain headers default to a newer version, we should also honor it and keep that version instead of forcing a lower version here. (If the toolchain defaults to a newer version, runtime libs of the toolchain may rely on such a new version anyway, so forcing a lower target within VLC might be useless.) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0d65fe038a76d3686d2e37c5b522fb24b92d8157 --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 9aba863449..16fd5f20d5 100644 --- a/configure.ac +++ b/configure.ac @@ -254,6 +254,11 @@ case "${host_os}" in AC_PREPROC_IFELSE([AC_LANG_PROGRAM( [[#ifdef _WIN32_WINNT # error _WIN32_WINNT already defined + #else + # include <windows.h> + # if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0601 + # error _WIN32_WINNT toolchain default high enough + # endif #endif ]],[[;]]) ],[ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
