diff options
| author | bunnei <bunneidev@gmail.com> | 2018-11-17 05:20:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-17 05:20:03 +0100 |
| commit | 6273a7aeeedbf36a278329ce6ea462ec9343e2fd (patch) | |
| tree | 5609fa40bdd1f96f2f280418ee02452f5b060563 | |
| parent | Merge pull request #1711 from ogniK5377/bluetooth-lets-go (diff) | |
| parent | Remove whitespace (diff) | |
| download | yuzu-6273a7aeeedbf36a278329ce6ea462ec9343e2fd.tar yuzu-6273a7aeeedbf36a278329ce6ea462ec9343e2fd.tar.gz yuzu-6273a7aeeedbf36a278329ce6ea462ec9343e2fd.tar.bz2 yuzu-6273a7aeeedbf36a278329ce6ea462ec9343e2fd.tar.lz yuzu-6273a7aeeedbf36a278329ce6ea462ec9343e2fd.tar.xz yuzu-6273a7aeeedbf36a278329ce6ea462ec9343e2fd.tar.zst yuzu-6273a7aeeedbf36a278329ce6ea462ec9343e2fd.zip | |
| -rwxr-xr-x | .travis/linux-mingw/docker.sh | 1 | ||||
| -rw-r--r-- | appveyor.yml | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/.travis/linux-mingw/docker.sh b/.travis/linux-mingw/docker.sh index d15c3f6e8..6cf43a006 100755 --- a/.travis/linux-mingw/docker.sh +++ b/.travis/linux-mingw/docker.sh @@ -57,3 +57,4 @@ done pip3 install pefile python3 .travis/linux-mingw/scan_dll.py package/*.exe "package/" +python3 .travis/linux-mingw/scan_dll.py package/imageformats/*.dll "package/" diff --git a/appveyor.yml b/appveyor.yml index 6d0e6522a..d6a69fbc2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -125,26 +125,27 @@ after_build: Copy-Item -path "$CMAKE_SOURCE_DIR/license.txt" -destination $RELEASE_DIST Copy-Item -path "$CMAKE_SOURCE_DIR/README.md" -destination $RELEASE_DIST + # copy the qt windows plugin dll to platforms + Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/platforms/qwindows.dll" -force -destination "$RELEASE_DIST/platforms" + + # copy the qt windows vista style dll to platforms + Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/styles/qwindowsvistastyle.dll" -force -destination "$RELEASE_DIST/styles" + + # copy the qt jpeg imageformat dll to platforms + Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/imageformats/qjpeg.dll" -force -destination "$RELEASE_DIST/imageformats" + # copy all the dll dependencies to the release folder . "./.appveyor/UtilityFunctions.ps1" $DLLSearchPath = "C:\msys64\mingw64\bin;$env:PATH" $MingwDLLs = RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\yuzu.exe" $MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\yuzu_cmd.exe" + $MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\imageformats\qjpeg.dll" Write-Host "Detected the following dependencies:" Write-Host $MingwDLLs foreach ($file in $MingwDLLs) { Copy-Item -path "$file" -force -destination "$RELEASE_DIST" } - # copy the qt windows plugin dll to platforms - Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/platforms/qwindows.dll" -force -destination "$RELEASE_DIST/platforms" - - # copy the qt windows vista style dll to platforms - Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/styles/qwindowsvistastyle.dll" -force -destination "$RELEASE_DIST/styles" - - # copy the qt jpeg imageformat dll to platforms - Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/imageformats/qjpeg.dll" -force -destination "$RELEASE_DIST/imageformats" - 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* 7z a $MINGW_SEVENZIP $RELEASE_DIST } |