ci/windows: Copy what of FFmpeg not already present
Prevents overwriting libwinpthreads.dll when one should already be present from the first DLL search.
This commit is contained in:
parent
770611fdf3
commit
caef92a584
|
@ -65,7 +65,7 @@ python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll
|
||||||
# copy FFmpeg libraries
|
# copy FFmpeg libraries
|
||||||
EXTERNALS_PATH="$(pwd)/build/externals"
|
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/ ';'
|
find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -nv {} package/ ';'
|
||||||
|
|
||||||
# copy libraries from yuzu.exe path
|
# copy libraries from yuzu.exe path
|
||||||
find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';'
|
find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';'
|
||||||
|
|
Reference in New Issue