From 2f32133ad5e13503c56bc5c910407a27cc23908b Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 15 Dec 2021 00:02:53 -0800 Subject: Revert "video_core/codecs: refactor ffmpeg searching and handling in cmake" --- .ci/scripts/windows/docker.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.ci') 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 done pip3 install pefile -python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/" +python3 .ci/scripts/windows/scan_dll.py package/*.exe "package/" +python3 .ci/scripts/windows/scan_dll.py 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 -- cgit v1.2.3