diff options
| author |  lat9nq | 2022-07-05 22:32:12 -0400 |
|---|---|---|
| committer | lat9nq | 2022-07-05 22:32:12 -0400 |
| commit | caef92a584271eaec7377d5f4cea008db8a91468 (patch) | |
| tree | 71f3f09bf5c63bda1b2dd2f8dac901481b306be0 /.ci | |
| parent | Merge pull request #8486 from liushuyu/github-actions-verify (diff) | |
| download | yuzu-caef92a584271eaec7377d5f4cea008db8a91468.tar.gz yuzu-caef92a584271eaec7377d5f4cea008db8a91468.tar.xz yuzu-caef92a584271eaec7377d5f4cea008db8a91468.zip | |
ci/windows: Copy what of FFmpeg not already present
Prevents overwriting libwinpthreads.dll when one should already be
present from the first DLL search.
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index d670fe47d..5bd5f0b6b 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh | |||
| @@ -65,7 +65,7 @@ python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll | |||
| 65 | # copy FFmpeg libraries | 65 | # copy FFmpeg libraries |
| 66 | EXTERNALS_PATH="$(pwd)/build/externals" | 66 | EXTERNALS_PATH="$(pwd)/build/externals" |
| 67 | FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin" | 67 | FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin" |
| 68 | find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';' | 68 | find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -nv {} package/ ';' |
| 69 | 69 | ||
| 70 | # copy libraries from yuzu.exe path | 70 | # copy libraries from yuzu.exe path |
| 71 | find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';' | 71 | find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';' |