ffmpeg | branch: master | Diego Biurrun <di...@biurrun.de> | Thu Mar 2 14:54:28 2017 +0100| [51411eb7ffba1437c1019f992990914f60232c39] | committer: Diego Biurrun
build: Special-case handling of SDL CFLAGS SDL adds some "special" CFLAGS that interfere with building normal binaries. Capture those CFLAGS separately and avoid adding them to the general CFLAGS. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51411eb7ffba1437c1019f992990914f60232c39 --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a8e3926b70..9f339e6af6 100755 --- a/configure +++ b/configure @@ -4782,7 +4782,13 @@ if enabled nvenc; then require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" fi -check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent +# SDL is "special" and adds some CFLAGS that should not pollute anything else. +if enabled avplay; then + CFLAGS_SAVE=$CFLAGS + check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent && + sdl_cflags=$pkg_cflags + CFLAGS=$CFLAGS_SAVE +fi ! disabled pod2man && check_cmd pod2man --help && enable pod2man || disable pod2man ! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
