diff options
| author | bunnei <bunneidev@gmail.com> | 2021-12-18 02:33:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 02:33:07 -0800 |
| commit | 2030522d86d1fac7ef95396b9d59d5cdedd7b892 (patch) | |
| tree | 55ddefd392b4c3514264282b78a882bfea956bb0 /.ci/scripts | |
| parent | 1490b49fa92e33b10beea0826f8af807967b4ffe (diff) | |
| parent | 476637d1435f031017abb06a42902b925dc08151 (diff) | |
Merge pull request #7587 from liushuyu/fix-linux-decoding
[Patch v2] externals/ffmpeg: refactor ffmpeg searching and handling in cmake
Diffstat (limited to '.ci/scripts')
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 155d8a5c8..584b9b39f 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -41,12 +41,11 @@ for i in package/*.exe; do done pip3 install pefile -python3 .ci/scripts/windows/scan_dll.py package/*.exe "package/" -python3 .ci/scripts/windows/scan_dll.py package/imageformats/*.dll "package/" +python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/" # copy FFmpeg libraries EXTERNALS_PATH="$(pwd)/build/externals" -FFMPEG_DLL_PATH="$(find ${EXTERNALS_PATH} -maxdepth 1 -type d | grep ffmpeg)/bin" +FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin" find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';' # copy libraries from yuzu.exe path |