mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 20:10:26 +08:00
56 lines
2.9 KiB
Diff
56 lines
2.9 KiB
Diff
|
diff --git "a/configure" "b/configure"
|
||
|
|
index c8be177..2fef830 100644
|
||
|
|
--- "a/configure"
|
||
|
|
+++ "b/configure"
|
||
|
|
@@ -5098,6 +5098,8 @@ case "$arch" in
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
|
||
|
|
+libvpx_name=vpx
|
||
|
|
+
|
||
|
|
# OS specific
|
||
|
|
case $target_os in
|
||
|
|
aix)
|
||
|
|
@@ -5269,6 +5271,15 @@ case $target_os in
|
||
|
|
enabled x86_64 && objformat="win64" || objformat="win32"
|
||
|
|
ranlib=:
|
||
|
|
enable dos_paths
|
||
|
|
+ if [ -z "${extra_cflags##*-MDd*}" ]; then
|
||
|
|
+ libvpx_name=vpxmdd
|
||
|
|
+ elif [ -z "${extra_cflags##*-MD*}" ]; then
|
||
|
|
+ libvpx_name=vpxmd
|
||
|
|
+ elif [ -z "${extra_cflags##*-MTd*}" ]; then
|
||
|
|
+ libvpx_name=vpxmtd
|
||
|
|
+ elif [ -z "${extra_cflags##*-MT*}" ]; then
|
||
|
|
+ libvpx_name=vpxmt
|
||
|
|
+ fi
|
||
|
|
;;
|
||
|
|
cygwin*)
|
||
|
|
target_os=cygwin
|
||
|
|
@@ -6153,21 +6164,21 @@ enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h
|
||
|
|
enabled libvpx && {
|
||
|
|
enabled libvpx_vp8_decoder && {
|
||
|
|
check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
|
||
|
|
- check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
|
||
|
|
+ check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name ||
|
||
|
|
die "ERROR: libvpx decoder version must be >=1.4.0";
|
||
|
|
}
|
||
|
|
enabled libvpx_vp8_encoder && {
|
||
|
|
check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
|
||
|
|
- check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
|
||
|
|
+ check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name ||
|
||
|
|
die "ERROR: libvpx encoder version must be >=1.4.0";
|
||
|
|
}
|
||
|
|
enabled libvpx_vp9_decoder && {
|
||
|
|
check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
|
||
|
|
- check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
|
||
|
|
+ check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs"
|
||
|
|
}
|
||
|
|
enabled libvpx_vp9_encoder && {
|
||
|
|
check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
|
||
|
|
- check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
|
||
|
|
+ check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs"
|
||
|
|
}
|
||
|
|
if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
|
||
|
|
die "libvpx enabled but no supported decoders found"
|