Mercurial > mplayer.hg
comparison configure @ 36882:89c3ef454d9e
Add the proper CFLAGS when compiling against shared FFmpeg.
Using pkg-configs --cflags when testing but not when compiling
makes no sense.
| author | reimar |
|---|---|
| date | Wed, 05 Mar 2014 18:48:23 +0000 |
| parents | 36f6023a9127 |
| children | 590e9305f12c |
comparison
equal
deleted
inserted
replaced
| 36881:36f6023a9127 | 36882:89c3ef454d9e |
|---|---|
| 7087 ffmpeg_so=no | 7087 ffmpeg_so=no |
| 7088 if $_pkg_config --exists libavutil ; then | 7088 if $_pkg_config --exists libavutil ; then |
| 7089 inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil) | 7089 inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil) |
| 7090 ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil) | 7090 ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil) |
| 7091 header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp && | 7091 header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp && |
| 7092 extra_cflags="$extra_cflags $inc_ffmpeg" && | |
| 7092 extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes | 7093 extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes |
| 7093 elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then | 7094 elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then |
| 7094 extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil" | 7095 extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil" |
| 7095 ffmpeg_so=yes | 7096 ffmpeg_so=yes |
| 7096 ffmpeg=yes | 7097 ffmpeg=yes |
| 7132 postproc=yes | 7133 postproc=yes |
| 7133 elif $_pkg_config --exists libpostproc ; then | 7134 elif $_pkg_config --exists libpostproc ; then |
| 7134 inc_postproc=$($_pkg_config --cflags libpostproc) | 7135 inc_postproc=$($_pkg_config --cflags libpostproc) |
| 7135 ld_tmp=$($_pkg_config --libs libpostproc) | 7136 ld_tmp=$($_pkg_config --libs libpostproc) |
| 7136 header_check libpostproc/postprocess.h $inc_postproc $ld_tmp && | 7137 header_check libpostproc/postprocess.h $inc_postproc $ld_tmp && |
| 7138 extra_cflags="$extra_cflags $inc_postproc" && | |
| 7137 extra_ldflags="$extra_ldflags $ld_tmp" && postproc=yes | 7139 extra_ldflags="$extra_ldflags $ld_tmp" && postproc=yes |
| 7138 elif header_check libpostproc/postprocess.h -lpostproc ; then | 7140 elif header_check libpostproc/postprocess.h -lpostproc ; then |
| 7139 extra_ldflags="$extra_ldflags -lpostproc" | 7141 extra_ldflags="$extra_ldflags -lpostproc" |
| 7140 postproc=yes | 7142 postproc=yes |
| 7141 fi | 7143 fi |