From a1ea8bf3f611ca4582cdb53141a07c64ea9d92d4 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 15 Sep 2019 16:32:49 +1000 Subject: [PATCH] deploy all new dlls with windows build --- appveyor-build.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/appveyor-build.sh b/appveyor-build.sh index f3ddfd3f7..576d79800 100644 --- a/appveyor-build.sh +++ b/appveyor-build.sh @@ -29,22 +29,24 @@ cp ../app/olive-editor.exe . # Inject Qt libraries windeployqt --debug olive-editor.exe -# Inject all other libraries -cp /mingw64/bin/libgcc_s_seh*.dll . -cp /mingw64/bin/libstdc++*.dll . -cp /mingw64/bin/av*.dll . -cp /mingw64/bin/sw*.dll . -cp /mingw64/bin/postproc*.dll . -cp /mingw64/bin/libOpenColorIO*.dll . -cp /mingw64/bin/libOpenImageIO*.dll . -cp /mingw64/bin/libwinpthread*.dll . -cp /mingw64/bin/libcelt*.dll . -cp /mingw64/bin/libgsm*.dll . +# Inject all other libraries (loops over dependency output from ldd) +ldd olive-editor.exe | while read -r dep +do + # Acquire full path to dependency + dep_output=( $dep ) + dep_path=${dep_output[2]} + + # If this is a mingw dependency, copy it into the deploy folder + if [[ $dep_path == /mingw64* ]] + then + cp $dep_path . + fi +done # Package installer cd .. cp app/packaging/windows/nsis/* . -"/c/Program Files (x86)/NSIS/makensis.exe" /V4 /DX64 "/XOutFile $BUILDNAME.exe" olive.nsi +"/c/Program Files (x86)/NSIS/makensis.exe" -V4 -DX64 "-XOutFile $BUILDNAME.exe" olive.nsi # Package portable touch olive/portable