diff options
| author |  bunnei | 2021-12-15 00:02:53 -0800 |
|---|---|---|
| committer |  GitHub | 2021-12-15 00:02:53 -0800 |
| commit | 2f32133ad5e13503c56bc5c910407a27cc23908b (patch) | |
| tree | 486a47945aa83e2842f54dce2e9f153d396a1886 /.ci | |
| parent | Merge pull request #7565 from liushuyu/fix-linux-decoding (diff) | |
| download | yuzu-2f32133ad5e13503c56bc5c910407a27cc23908b.tar.gz yuzu-2f32133ad5e13503c56bc5c910407a27cc23908b.tar.xz yuzu-2f32133ad5e13503c56bc5c910407a27cc23908b.zip | |
Revert "video_core/codecs: refactor ffmpeg searching and handling in cmake"
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 584b9b39f..155d8a5c8 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh | |||
| @@ -41,11 +41,12 @@ for i in package/*.exe; do | |||
| 41 | done | 41 | done |
| 42 | 42 | ||
| 43 | pip3 install pefile | 43 | pip3 install pefile |
| 44 | python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/" | 44 | python3 .ci/scripts/windows/scan_dll.py package/*.exe "package/" |
| 45 | python3 .ci/scripts/windows/scan_dll.py package/imageformats/*.dll "package/" | ||
| 45 | 46 | ||
| 46 | # copy FFmpeg libraries | 47 | # copy FFmpeg libraries |
| 47 | EXTERNALS_PATH="$(pwd)/build/externals" | 48 | EXTERNALS_PATH="$(pwd)/build/externals" |
| 48 | FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin" | 49 | FFMPEG_DLL_PATH="$(find ${EXTERNALS_PATH} -maxdepth 1 -type d | grep ffmpeg)/bin" |
| 49 | find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';' | 50 | find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';' |
| 50 | 51 | ||
| 51 | # copy libraries from yuzu.exe path | 52 | # copy libraries from yuzu.exe path |