diff options
| author | lat9nq <lat9nq@gmail.com> | 2022-07-05 22:32:12 -0400 |
|---|---|---|
| committer | lat9nq <lat9nq@gmail.com> | 2022-07-05 22:32:12 -0400 |
| commit | caef92a584271eaec7377d5f4cea008db8a91468 (patch) | |
| tree | 71f3f09bf5c63bda1b2dd2f8dac901481b306be0 | |
| parent | 770611fdf39f274ee9ccde9875e86cfeb79a3f6f (diff) | |
ci/windows: Copy what of FFmpeg not already present
Prevents overwriting libwinpthreads.dll when one should already be
present from the first DLL search.
| -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 # copy FFmpeg libraries EXTERNALS_PATH="$(pwd)/build/externals" 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/ ';' +find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -nv {} package/ ';' # copy libraries from yuzu.exe path find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';' |