summaryrefslogtreecommitdiffstats
path: root/.ci/scripts/windows
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-12-18 11:33:07 +0100
committerGitHub <noreply@github.com>2021-12-18 11:33:07 +0100
commit2030522d86d1fac7ef95396b9d59d5cdedd7b892 (patch)
tree55ddefd392b4c3514264282b78a882bfea956bb0 /.ci/scripts/windows
parentMerge pull request #7596 from Tatsh/externals-sdl-config-joycon-fix (diff)
parentexternals/ffmpeg: set the cmake variable twice ... (diff)
downloadyuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar.gz
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar.bz2
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar.lz
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar.xz
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar.zst
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.zip
Diffstat (limited to '.ci/scripts/windows')
-rwxr-xr-x.ci/scripts/windows/docker.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh
index 155d8a5c8..584b9b39f 100755
--- a/.ci/scripts/windows/docker.sh
+++ b/.ci/scripts/windows/docker.sh
@@ -41,12 +41,11 @@ for i in package/*.exe; do
done
pip3 install pefile
-python3 .ci/scripts/windows/scan_dll.py package/*.exe "package/"
-python3 .ci/scripts/windows/scan_dll.py package/imageformats/*.dll "package/"
+python3 .ci/scripts/windows/scan_dll.py package/*.exe 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