mirror of https://github.com/qt/qt5.git
Enable zlib in FFmpeg configuration
Fixes: QTBUG-103332 Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I87a760edcd4d8a77966ec5a692cb1f1f4242b647 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
This commit is contained in:
parent
d48682bcdf
commit
f7af78977c
|
@ -2,6 +2,7 @@
|
|||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
. "$PSScriptRoot\zlib-helpers.ps1"
|
||||
|
||||
# This script will install FFmpeg
|
||||
$msys = "C:\Utils\msys64\usr\bin\bash"
|
||||
|
@ -113,6 +114,13 @@ function InstallMsvcFfmpeg {
|
|||
}
|
||||
}
|
||||
|
||||
$zlibPath = GetZlibPathByString -TargetArchitecture $arch
|
||||
$zlibPath = $zlibPath -replace '\\', '/'
|
||||
|
||||
$config += " --enable-zlib"
|
||||
$config += " --extra-cflags=`"-I$zlibPath`""
|
||||
$config += " --extra-ldflags=`"-LIBPATH:$zlibPath`""
|
||||
|
||||
$result = EnterVSDevShell -HostArch $hostArch -Arch $arch
|
||||
if (-Not $result) {
|
||||
return $false
|
||||
|
|
Loading…
Reference in New Issue